summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-09-19 15:57:46 +0200
committerTobrun <tobrun@mapbox.com>2018-09-19 18:21:38 +0200
commit47eaea21ddf1f56e3bb1b8ab35acee8a84f91533 (patch)
treebea15119a421fd33449169c36fcbb9a3def89aae
parentcd031be68e04348f361ae77b18b0e33ec9105e83 (diff)
downloadqtlocation-mapboxgl-47eaea21ddf1f56e3bb1b8ab35acee8a84f91533.tar.gz
[android] - update proguard config to not warn about AutoValue
-rw-r--r--platform/android/MapboxGLAndroidSDK/proguard-rules.pro1
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro2
2 files changed, 1 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
index 28aa33b5f6..cca9305ed8 100644
--- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
+++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
@@ -25,6 +25,7 @@
# config for mapbox-sdk-geojson:3.0.1
-keep class com.mapbox.geojson.** { *; }
+-dontwarn com.google.auto.value.**
-dontnote com.google.gson.internal.UnsafeAllocator
# config for mapbox-android-gestures:0.0.1-20180228.152340-13
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
index f8243ca44f..593a4dadfa 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
+++ b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
@@ -2,8 +2,6 @@
-dontwarn android.support.**
-dontwarn java.lang.**
-dontwarn org.codehaus.**
--keep class com.google.**
--dontwarn com.google.**
-dontwarn java.nio.**
-keep class com.mapbox.mapboxsdk.testapp.model.customlayer.ExampleCustomLayer { *; }