summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2016-04-29 14:27:41 +0200
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-05-02 10:08:21 -0700
commitc6550fd803fe80595c9f60b5980d4d1621efaa54 (patch)
tree5ef2d816f63aa5cb0c553888e9fccff87061c13d
parentde43b8c2d8faa7f17b39af4f32fb057db89b79e6 (diff)
downloadvendor_cmsdk-c6550fd803fe80595c9f60b5980d4d1621efaa54.zip
vendor_cmsdk-c6550fd803fe80595c9f60b5980d4d1621efaa54.tar.gz
vendor_cmsdk-c6550fd803fe80595c9f60b5980d4d1621efaa54.tar.bz2
cmsdk: include our own consumer proguard rules
Include a proguard file with can be consumed by the latest gradle plugin to merge this ones rules without the rules of the app linked to. This way devs doesn't need to declare (in a recent version of the gradle plugin) -dontwarn and -dontnote for cyanogenmod.library when linked to it, because proguard crashes the build because it cannot access to cm system private classes. Change-Id: I7c94a9119db744b0029b4d9a8aa782adcbd47b93 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r--Android.mk1
-rw-r--r--sdk/proguard.txt3
2 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index e8bd59e..59390a2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -143,6 +143,7 @@ LOCAL_JACK_ENABLED := disabled
# just need to define this, $(TOP)/dummy should not exist
LOCAL_SRC_FILES := $(call all-java-files-under, dummy)
+LOCAL_CONSUMER_PROGUARD_FILE := $(LOCAL_PATH)/sdk/proguard.txt
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, sdk/res/res)
LOCAL_MANIFEST_FILE := sdk/AndroidManifest.xml
diff --git a/sdk/proguard.txt b/sdk/proguard.txt
new file mode 100644
index 0000000..909b72d
--- /dev/null
+++ b/sdk/proguard.txt
@@ -0,0 +1,3 @@
+# Ignore CyanogenMod SDK access to private resources
+-dontwarn cyanogenmod.**
+-dontnote cyanogenmod.**