From dbb520662d0145a0219e319a67bbe81326c144e3 Mon Sep 17 00:00:00 2001 From: Jesse Bounds Date: Tue, 29 Nov 2016 12:55:07 -0800 Subject: [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. --- platform/android/config.cmake | 3 --- 1 file changed, 3 deletions(-) (limited to 'platform/android') 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} $ -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 ${STRIP_COMMAND} $ -o ${ANDROID_TEST_APP_JNI_TARGET_DIR}$ ) -- cgit v1.2.1