From 625785e4b8b702843e8582ea1486bdb251b2d231 Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Wed, 21 Sep 2016 18:32:51 +0200 Subject: [PATCH] [android] enable RELRO (#6419) --- .mason | 2 +- platform/android/scripts/toolchain.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mason b/.mason index 508d7add9..7cc64b1f3 160000 --- a/.mason +++ b/.mason @@ -1 +1 @@ -Subproject commit 508d7add9bde4afc9c085ebe1c8395a6c867bf5c +Subproject commit 7cc64b1f32930d0de99381e21dd2cab9f474fa4f diff --git a/platform/android/scripts/toolchain.sh b/platform/android/scripts/toolchain.sh index f69f0752f..a64818dd2 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)`\")"