aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-10-23 15:26:55 -0700
committercretin45 <cretin45@gmail.com>2015-10-23 15:26:55 -0700
commit10e7d5fc921bc18c672da882d868d6a457907c00 (patch)
tree0e8ec1d374ed73f1fbe1fccfe6dcc764926ca3ce
parentcf85872fb83576c7c15b22bd4bda3688de81600c (diff)
downloadandroid_packages_apps_LockClock-10e7d5fc921bc18c672da882d868d6a457907c00.tar.gz
android_packages_apps_LockClock-10e7d5fc921bc18c672da882d868d6a457907c00.tar.bz2
android_packages_apps_LockClock-10e7d5fc921bc18c672da882d868d6a457907c00.zip
LockClock: Update proguard for play services 8115000
Change-Id: I592cc22dded005c40922b0cc0a577a434d325f47
-rw-r--r--proguard.flags26
-rw-r--r--res/values/version.xml4
2 files changed, 26 insertions, 4 deletions
diff --git a/proguard.flags b/proguard.flags
index 933b849..133c8ce 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,3 +1,29 @@
-keep class com.cyanogenmod.lockclock.preference.Preferences {
*;
}
+
+-keep class * extends java.util.ListResourceBundle {
+ protected Object[][] getContents();
+}
+
+# Keep SafeParcelable value, needed for reflection. This is required to support backwards
+# compatibility of some classes.
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+ public static final *** NULL;
+}
+
+# Keep the names of classes/members we need for client functionality.
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+ @com.google.android.gms.common.annotation.KeepName *;
+}
+
+# Needed for Parcelable/SafeParcelable Creators to not get stripped
+-keepnames class * implements android.os.Parcelable {
+ public static final ** CREATOR;
+}
+
+# Needed when building against the Marshmallow SDK
+-dontwarn org.apache.http.**
+-dontwarn android.support.**
+-dontwarn com.google.android.gms.**
diff --git a/res/values/version.xml b/res/values/version.xml
deleted file mode 100644
index 1e7fd4e..0000000
--- a/res/values/version.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <integer name="google_play_services_version">4323000</integer>
-</resources>