[android][build] Only strip the resulting libraries (#6222)

mapbox · Aug 31, 2016 · 3e71b84 · 3e71b84
1 parent dd4d1a9
commit 3e71b84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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 $<TARGET_FILE:mapbox-gl> ${ANDROID_JNI_TARGET_DIR}
+    COMMAND ${STRIP_COMMAND} $<TARGET_FILE:mapbox-gl> -o ${ANDROID_JNI_TARGET_DIR}$<TARGET_FILE_NAME:mapbox-gl>
     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 $<TARGET_FILE:example-custom-layer> ${ANDROID_TEST_APP_JNI_TARGET_DIR}
+    COMMAND ${STRIP_COMMAND} $<TARGET_FILE:example-custom-layer> -o ${ANDROID_TEST_APP_JNI_TARGET_DIR}$<TARGET_FILE_NAME:example-custom-layer>
 )
 
 add_custom_target(_all ALL

diff --git 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)`\")"