summaryrefslogtreecommitdiff
path: root/platform/android/config.cmake
diff options
context:
space:
mode:
authorJesse Bounds <jesse@rebounds.net>2016-11-29 12:55:07 -0800
committerJesse Bounds <jesse@rebounds.net>2016-11-30 16:19:22 -0800
commitdbb520662d0145a0219e319a67bbe81326c144e3 (patch)
treed1fd53eea7ca1f37744365007f1267f4cb984d2e /platform/android/config.cmake
parente9504912dc4eca1793be200cc46c14d81fbf1ee5 (diff)
downloadqtlocation-mapboxgl-dbb520662d0145a0219e319a67bbe81326c144e3.tar.gz
[ios, android] Move der files to ios platform
.der files are used only by the iOS platform for SSL pinning. This moves them out of the `platform/default/resources` directory and into `platform/ios/resources`. The make configuration for Android is updated so that it stops attempting to copy the files at all.
Diffstat (limited to 'platform/android/config.cmake')
-rw-r--r--platform/android/config.cmake3
1 files changed, 0 insertions, 3 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index 74412e4ae5..05037589fb 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -180,9 +180,6 @@ add_custom_target(copy-files
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 ${STRIP_COMMAND} $<TARGET_FILE:example-custom-layer> -o ${ANDROID_TEST_APP_JNI_TARGET_DIR}$<TARGET_FILE_NAME:example-custom-layer>
)