diff options
Diffstat (limited to 'platform/android/config.cmake')
| -rw-r--r-- | platform/android/config.cmake | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index fdf03b4ec8..1a68ee065d 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -22,15 +22,6 @@ mason_use(sqlite VERSION 3.14.2) mason_use(gtest VERSION 1.8.0) mason_use(icu VERSION 58.1-min-size) -set(ANDROID_SDK_PROJECT_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK) -set(ANDROID_JNI_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/jniLibs/${ANDROID_ABI}) -set(ANDROID_ASSETS_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/assets) -set(ANDROID_TEST_APP_JNI_TARGET_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs/${ANDROID_ABI}) - -if (NOT DEFINED ANDROID_TOOLCHAIN_PREFIX) - set(ANDROID_TOOLCHAIN_PREFIX "${MASON_XC_ROOT}/bin/${ANDROID_TOOLCHAIN}-") -endif() - ## mbgl core ## macro(mbgl_platform_core) @@ -251,11 +242,6 @@ target_link_libraries(mapbox-gl PUBLIC -Wl,--version-script=${CMAKE_SOURCE_DIR}/platform/android/version-script ) -# Create a stripped version of the library and copy it to the JNIDIR. -add_custom_command(TARGET mapbox-gl POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_JNI_TARGET_DIR} - COMMAND ${ANDROID_TOOLCHAIN_PREFIX}strip $<TARGET_FILE:mapbox-gl> -o ${ANDROID_JNI_TARGET_DIR}/$<TARGET_FILE_NAME:mapbox-gl>) - ## Test library ## add_library(mbgl-test SHARED @@ -312,11 +298,6 @@ target_add_mason_package(mbgl-test PRIVATE boost) target_add_mason_package(mbgl-test PRIVATE geojson) target_add_mason_package(mbgl-test PRIVATE geojsonvt) -add_custom_command(TARGET mbgl-test POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/stripped - COMMAND ${ANDROID_TOOLCHAIN_PREFIX}strip $<TARGET_FILE:mapbox-gl> -o ${CMAKE_CURRENT_BINARY_DIR}/stripped/$<TARGET_FILE_NAME:mapbox-gl> - COMMAND ${ANDROID_TOOLCHAIN_PREFIX}strip $<TARGET_FILE:mbgl-test> -o ${CMAKE_CURRENT_BINARY_DIR}/stripped/$<TARGET_FILE_NAME:mbgl-test>) - ## Custom layer example ## add_library(example-custom-layer SHARED @@ -334,7 +315,3 @@ target_link_libraries(example-custom-layer PUBLIC -Wl,--gc-sections PUBLIC -Wl,--version-script=${CMAKE_SOURCE_DIR}/platform/android/version-script ) - -add_custom_command(TARGET example-custom-layer POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_TEST_APP_JNI_TARGET_DIR} - COMMAND ${ANDROID_TOOLCHAIN_PREFIX}strip $<TARGET_FILE:example-custom-layer> -o ${ANDROID_TEST_APP_JNI_TARGET_DIR}/$<TARGET_FILE_NAME:example-custom-layer>) |