diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-12-03 15:36:42 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-12-03 15:36:42 -0800 |
| commit | 3503c0e7679d5802068fc2ab2420b575a8ae2fc7 (patch) | |
| tree | d1cfdd3ca2f2fb9761466a61e77d82d8f6b76002 /platform/android | |
| parent | 84038832e45c2445b43b39ccb2f9e29c8646dac0 (diff) | |
| parent | 9eb7f88b2c292d322a104c4580c3ef29958b628b (diff) | |
| download | qtlocation-mapboxgl-3503c0e7679d5802068fc2ab2420b575a8ae2fc7.tar.gz | |
Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.4-master
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java | 1 | ||||
| -rw-r--r-- | platform/android/config.cmake | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java index b7ce27dd6e..7cd36076d3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java @@ -1,6 +1,7 @@ // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`. package com.mapbox.mapboxsdk.testapp.style; +import android.graphics.Color; import android.support.test.espresso.Espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; diff --git a/platform/android/config.cmake b/platform/android/config.cmake index da0901ed9a..ff02750450 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -33,15 +33,9 @@ macro(mbgl_android_copy_asset source target) endmacro() mbgl_android_copy_asset(common/ca-bundle.crt ca-bundle.crt) -mbgl_android_copy_asset(platform/default/resources/api_mapbox_com-digicert.der api_mapbox_com-digicert.der) -mbgl_android_copy_asset(platform/default/resources/api_mapbox_com-geotrust.der api_mapbox_com-geotrust.der) -mbgl_android_copy_asset(platform/default/resources/star_tilestream_net.der star_tilestream_net.der) add_custom_target(mbgl-copy-android-assets DEPENDS ${ANDROID_ASSETS_TARGET_DIR}/ca-bundle.crt - DEPENDS ${ANDROID_ASSETS_TARGET_DIR}/api_mapbox_com-digicert.der - DEPENDS ${ANDROID_ASSETS_TARGET_DIR}/api_mapbox_com-geotrust.der - DEPENDS ${ANDROID_ASSETS_TARGET_DIR}/star_tilestream_net.der ) ## mbgl core ## |