diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2015-10-14 16:48:59 +0200 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2015-10-14 16:48:59 +0200 |
| commit | 5b9deae95709ea557f28e4a5dcbe3ac8fd47023e (patch) | |
| tree | 4d5c091a762acac7649b82dc095330ecfe3cc5b4 /android | |
| parent | 09144fbcc0c30cf6f348678a4c5e16d7c517936f (diff) | |
| parent | f4fe5447606f2c71d3ae2b9ab96eea0a15821037 (diff) | |
| download | qtlocation-mapboxgl-5b9deae95709ea557f28e4a5dcbe3ac8fd47023e.tar.gz | |
Merge branch 'pull_branch' of https://github.com/Mappy/mapbox-gl-native into Mapp-pull_branch
Diffstat (limited to 'android')
| -rw-r--r-- | android/java/MapboxGLAndroidSDK/proguard-rules.pro | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/android/java/MapboxGLAndroidSDK/proguard-rules.pro b/android/java/MapboxGLAndroidSDK/proguard-rules.pro index 6d3ca44d49..6853f3ddea 100644 --- a/android/java/MapboxGLAndroidSDK/proguard-rules.pro +++ b/android/java/MapboxGLAndroidSDK/proguard-rules.pro @@ -7,18 +7,18 @@ -dontwarn okio.** # Package: annotations --keep class com.mapbox.mapboxgl.annotations.** { *; } +-keep class com.mapbox.mapboxsdk.annotations.** { *; } # Package: geometry --keep class com.mapbox.mapboxgl.geometry.** { *; } +-keep class com.mapbox.mapboxsdk.geometry.** { *; } # Package: http --keep class com.mapbox.mapboxgl.http.** { *; } +-keep class com.mapbox.mapboxsdk.http.** { *; } # Package views --keep class com.mapbox.mapboxgl.views.MapView** --keep class com.mapbox.mapboxgl.views.NativeMapView** --keepclassmembers class com.mapbox.mapboxgl.views.NativeMapView** { +-keep class com.mapbox.mapboxsdk.views.MapView** +-keep class com.mapbox.mapboxsdk.views.NativeMapView** +-keepclassmembers class com.mapbox.mapboxsdk.views.NativeMapView** { *; } |