From 3e71b84d28859d7d765ae443845459e516345011 Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Wed, 31 Aug 2016 15:16:16 +0200 Subject: [PATCH] [android][build] Only strip the resulting libraries (#6222) --- platform/android/config.cmake | 4 ++-- platform/android/scripts/toolchain.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/android/config.cmake b/platform/android/config.cmake index cc9a38c3a..a213a048a 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -158,14 +158,14 @@ add_custom_target(copy-files DEPENDS mapbox-gl DEPENDS example-custom-layer COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_JNI_TARGET_DIR} - COMMAND ${CMAKE_COMMAND} -E copy $ ${ANDROID_JNI_TARGET_DIR} + COMMAND ${STRIP_COMMAND} $ -o ${ANDROID_JNI_TARGET_DIR}$ COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_ASSETS_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/common/ca-bundle.crt ${ANDROID_ASSETS_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/platform/default/resources/api_mapbox_com-digicert.der ${ANDROID_ASSETS_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/platform/default/resources/api_mapbox_com-geotrust.der ${ANDROID_ASSETS_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/platform/default/resources/star_tilestream_net.der ${ANDROID_ASSETS_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_TEST_APP_JNI_TARGET_DIR} - COMMAND ${CMAKE_COMMAND} -E copy $ ${ANDROID_TEST_APP_JNI_TARGET_DIR} + COMMAND ${STRIP_COMMAND} $ -o ${ANDROID_TEST_APP_JNI_TARGET_DIR}$ ) add_custom_target(_all ALL diff --git a/platform/android/scripts/toolchain.sh b/platform/android/scripts/toolchain.sh index cc8d64fc1..f69f0752f 100755 --- a/platform/android/scripts/toolchain.sh +++ b/platform/android/scripts/toolchain.sh @@ -17,5 +17,6 @@ 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_CXX_FLAGS \"-s `mason env CXXFLAGS` \${CMAKE_CXX_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)`\")"