From 6ccdd7d4817ea550db0578fa63da5d0f9335297b Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Tue, 26 Jul 2016 13:55:04 -0400 Subject: [build] copy custom-layer-example.so to the right sub-module --- platform/android/config.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/android/config.cmake b/platform/android/config.cmake index e4976930f7..b5924b110e 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -92,18 +92,20 @@ target_link_libraries(example-custom-layer set(ANDROID_SDK_PROJECT_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK) set(ANDROID_JNI_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/jniLibs/${ANDROID_JNIDIR}/) 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_JNIDIR}/) 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 ${CMAKE_COMMAND} -E copy $ ${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} ) add_custom_target(_all ALL -- cgit v1.2.1