diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-09-20 12:20:30 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-09-22 00:45:13 +0200 |
commit | 6f0c9927a3f8671bbb1c54c8028a5f72e6d7f327 (patch) | |
tree | c927fdc39435393ebddb69abcfb64b6e4ed1f1b0 | |
parent | d5f0e4b41e0ece7795a350cc6b9b68fc3aa356ce (diff) | |
download | qtlocation-mapboxgl-6f0c9927a3f8671bbb1c54c8028a5f72e6d7f327.tar.gz |
[android] - complete proguard revision
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/proguard-rules.pro | 40 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro | 14 |
2 files changed, 24 insertions, 30 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro index cca9305ed8..77f75d8714 100644 --- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro +++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro @@ -3,43 +3,33 @@ # contents of this file will be appended into proguard-android.txt -keepattributes Signature, *Annotation*, EnclosingMethod -# config for the SDK +# Reflection on classes from native code -keep class com.google.gson.JsonArray { *; } -keep class com.google.gson.JsonElement { *; } -keep class com.google.gson.JsonObject { *; } -keep class com.google.gson.JsonPrimitive { *; } +-dontnote com.google.gson.** -# config for okhttp 3.8.0, https://github.com/square/okhttp/pull/3354 --dontwarn okio.** --dontwarn javax.annotation.** --dontnote okhttp3.** +# dontnote for keeps the entry point x but not the descriptor class y +-dontnote com.mapbox.mapboxsdk.maps.MapboxMap$OnFpsChangedListener +-dontnote com.mapbox.mapboxsdk.style.layers.PropertyValue +-dontnote com.mapbox.mapboxsdk.maps.MapboxMap +-dontnote com.mapbox.mapboxsdk.maps.MapboxMapOptions +-dontnote com.mapbox.mapboxsdk.log.LoggerDefinition +-dontnote com.mapbox.android.core.location.LocationEnginePriority -# config for mapbox-android-telemetry:3.0.0-beta.1 --keep class com.mapbox.android.telemetry.** { *; } --dontwarn com.mapbox.android.core.location.MockLocationEngine --dontwarn com.mapbox.android.core.location.MockLocationEngine$LocationUpdateRunnable --dontwarn java.awt.Color --dontwarn com.mapzen.android.lost.api** --dontwarn org.conscrypt.OpenSSLProvider --dontwarn org.conscrypt.Conscrypt +# config for okhttp 3.11.0, https://github.com/square/okhttp/pull/3354 +-dontwarn javax.annotation.** +-dontnote okhttp3.internal.** +-dontwarn org.codehaus.** # 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 --dontnote com.mapbox.android.gestures.* -# config for additional warnings --keep class com.google.android.gms.dynamite.descriptors.com.google.android.gms.flags.ModuleDescriptor { java.lang.String MODULE_ID; } --keep class com.google.android.gms.dynamite.descriptors.com.google.android.gms.flags.ModuleDescriptor { int MODULE_VERSION; } --keep class com.google.android.gms.dynamite.DynamiteModule$DynamiteLoaderClassLoader { java.lang.ClassLoader sClassLoader; } --dontnote com.google.devtools.build.android.desugar.runtime.ThrowableExtension +# config for additional notes -dontnote org.robolectric.Robolectric -dontnote libcore.io.Memory --dontnote com.google.protobuf.ExtensionRegistry --dontnote com.google.protobuf.Extension +-dontnote com.google.protobuf.** -dontnote android.net.** -dontnote org.apache.http.** --dontwarn com.sun.xml.internal.ws.spi.db.**
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro index 593a4dadfa..6860246e1c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro +++ b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro @@ -1,7 +1,11 @@ -# Mapbox ProGuard configuration is handled in the SDK --dontwarn android.support.** --dontwarn java.lang.** --dontwarn org.codehaus.** --dontwarn java.nio.** +# Mapbox ProGuard configuration is handled in the SDK, +# This file contains test app specific configuration + +# Kotlin +-dontnote kotlin.** + +# LeakCanary +-dontnote com.squareup.leakcanary.internal.** +-dontnote gnu.trove.THashMap -keep class com.mapbox.mapboxsdk.testapp.model.customlayer.ExampleCustomLayer { *; } |