From dabfec6ddc2701e0e225ad8d90febbad299e6c1e Mon Sep 17 00:00:00 2001
From: tobrunvannuland <tobrun.van.nuland@gmail.com>
Date: Sun, 30 Aug 2015 20:46:13 +0200
Subject: [PATCH] Added proguard config for SDK

Updated build.gradle from the SDK to correct use proguard file from a AAR library

Adjusted build.gradle sample app to use the thumb proguard file

Added proguard config for SDK, added thumb config for sample project

Updated build.gradle from the SDK to correct use proguard file from a AAR library

Adjusted build.gradle sample app to use the thumb proguard file

Added proguard config for SDK, added thumb config for sample project

Updated build.gradle from the SDK to correct use proguard file from a AAR library

Adjusted build.gradle sample app to use the thumb proguard file
---
 android/java/MapboxGLAndroidSDK/build.gradle  |  3 +--
 .../MapboxGLAndroidSDK/proguard-rules.pro     | 24 +++++++++++++++++++
 .../MapboxGLAndroidSDKTestApp/build.gradle    |  2 +-
 .../proguard-rules.pro                        |  1 +
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 android/java/MapboxGLAndroidSDK/proguard-rules.pro
 create mode 100644 android/java/MapboxGLAndroidSDKTestApp/proguard-rules.pro

diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle
index b749765eb..ea0be4fa1 100644
--- a/android/java/MapboxGLAndroidSDK/build.gradle
+++ b/android/java/MapboxGLAndroidSDK/build.gradle
@@ -65,9 +65,8 @@ android {
         }
 
         release {
-            minifyEnabled false
             jniDebuggable false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            consumerProguardFiles 'proguard-rules.pro'
         }
     }
 }
diff --git a/android/java/MapboxGLAndroidSDK/proguard-rules.pro b/android/java/MapboxGLAndroidSDK/proguard-rules.pro
new file mode 100644
index 000000000..6d3ca44d4
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDK/proguard-rules.pro
@@ -0,0 +1,24 @@
+# By default, the flags in this file are appended to flags specified
+# in ../sdk/tools/proguard/proguard-android.txt,
+# contents of this file will be appended into proguard-android.txt
+
+# Square okio, ignoring warnings,
+# see https://github.com/square/okio/issues/60
+-dontwarn okio.**
+
+# Package: annotations
+-keep class com.mapbox.mapboxgl.annotations.** { *; }
+
+# Package: geometry
+-keep class com.mapbox.mapboxgl.geometry.** { *; }
+
+# Package: http
+-keep class com.mapbox.mapboxgl.http.** { *; }
+
+# Package views
+-keep class com.mapbox.mapboxgl.views.MapView**
+-keep class com.mapbox.mapboxgl.views.NativeMapView**
+-keepclassmembers class com.mapbox.mapboxgl.views.NativeMapView** {
+    *;
+}
+
diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
index b3e4164f2..b0c0f1a3e 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -73,7 +73,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
diff --git a/android/java/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/android/java/MapboxGLAndroidSDKTestApp/proguard-rules.pro
new file mode 100644
index 000000000..578d94692
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/proguard-rules.pro
@@ -0,0 +1 @@
+# Proguard configuration is handeld in the SDK
\ No newline at end of file