diff options
| author | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2016-09-21 18:32:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-21 18:32:51 +0200 |
| commit | 625785e4b8b702843e8582ea1486bdb251b2d231 (patch) | |
| tree | 4b2168cd55c211dadfab159fdd478489bb16c25e | |
| parent | 1165a408fbee37a0892b07b5c35e1a36d7aa0063 (diff) | |
| download | qtlocation-mapboxgl-625785e4b8b702843e8582ea1486bdb251b2d231.tar.gz | |
[android] enable RELRO (#6419)
| m--------- | .mason | 0 | ||||
| -rwxr-xr-x | platform/android/scripts/toolchain.sh | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/.mason b/.mason -Subproject 508d7add9bde4afc9c085ebe1c8395a6c867bf5 +Subproject 7cc64b1f32930d0de99381e21dd2cab9f474fa4 diff --git a/platform/android/scripts/toolchain.sh b/platform/android/scripts/toolchain.sh index f69f0752fa..a64818dd20 100755 --- a/platform/android/scripts/toolchain.sh +++ b/platform/android/scripts/toolchain.sh @@ -17,6 +17,7 @@ echo "set(CMAKE_C_COMPILER \"`which $(mason env CC)`\")" echo "set(ANDROID_JNIDIR \"`mason env JNIDIR`\")" echo "set(ANDROID_ABI \"\${ANDROID_JNIDIR}\")" echo "set(CMAKE_EXE_LINKER_FLAGS \"`mason env LDFLAGS` \${CMAKE_EXE_LINKER_FLAGS}\")" +echo "set(CMAKE_SHARED_LINKER_FLAGS \"`mason env LDFLAGS` \${CMAKE_SHARED_LINKER_FLAGS}\")" echo "set(CMAKE_CXX_FLAGS \"`mason env CXXFLAGS` \${CMAKE_CXX_FLAGS}\")" echo "set(CMAKE_C_FLAGS \"`mason env CPPFLAGS` \${CMAKE_C_FLAGS}\")" echo "set(STRIP_COMMAND \"`which $(mason env STRIP)`\")" |