diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-09-03 12:30:01 +0200 |
---|---|---|
committer | tobrun <tobrun.van.nuland@gmail.com> | 2018-09-03 12:30:01 +0200 |
commit | c283fd66d4d0c880938315f6396076015c63ae66 (patch) | |
tree | cb5ca58c28d43565c6a8eae709666fed4680a479 | |
parent | 95b89e69857eca6a04a3472ef6537f65bc1049de (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-proguard-fix.tar.gz |
[android] - add Keep annotations to abstract componentsupstream/tvn-proguard-fix
3 files changed, 6 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java index 5535e20923..5de90b1d67 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java @@ -5,6 +5,7 @@ import com.mapbox.mapboxsdk.Mapbox; import java.util.concurrent.locks.ReentrantLock; +@Keep public class NativeHttpRequest implements HttpResponder { private final HttpRequest httpRequest = Mapbox.getModuleProvider().createHttpRequest(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java index c5b5eec393..fe443b81aa 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.log; +import android.support.annotation.Keep; import android.util.Log; /** @@ -9,6 +10,7 @@ import android.util.Log; * Alternative implementations can be set with {@link #setLoggerDefinition(LoggerDefinition)}. * </p> */ +@Keep public final class Logger { private static final LoggerDefinition DEFAULT = new LoggerDefinition() { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index b4709930eb..cf0a8ed66e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -34,12 +34,14 @@ android { buildTypes { debug { - testCoverageEnabled = true + testCoverageEnabled true minifyEnabled false + shrinkResources false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } release { minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.debug } |