diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-05 17:53:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-05 17:53:51 +0000 |
| commit | ab8fa0fe17ae7a24feae54efc070d90628ed4bbd (patch) | |
| tree | d8a97cbb35c6186ec67fa56eb21a6755772aef9b | |
| parent | 915d04b422c527a094ebfb19b4795d353d4ceec7 (diff) | |
| parent | e9eeb27eb06d675a5290a56d5868f70995b52680 (diff) | |
| download | android_packages_apps_Gallery2-ab8fa0fe17ae7a24feae54efc070d90628ed4bbd.tar.gz android_packages_apps_Gallery2-ab8fa0fe17ae7a24feae54efc070d90628ed4bbd.tar.bz2 android_packages_apps_Gallery2-ab8fa0fe17ae7a24feae54efc070d90628ed4bbd.zip | |
Merge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-dev
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | jarjar-rules.txt | 1 | ||||
| -rw-r--r-- | proguard.flags | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 68d573a00..34d7cb481 100644 --- a/Android.mk +++ b/Android.mk @@ -39,6 +39,8 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_JAVA_LIBRARIES += org.apache.http.legacy +LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt + include $(BUILD_PACKAGE) ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),) diff --git a/jarjar-rules.txt b/jarjar-rules.txt new file mode 100644 index 000000000..99555e465 --- /dev/null +++ b/jarjar-rules.txt @@ -0,0 +1 @@ +rule android.util.Pools** com.android.photos.util.Pools@1 diff --git a/proguard.flags b/proguard.flags index c8ba2ffad..72cba5158 100644 --- a/proguard.flags +++ b/proguard.flags @@ -84,5 +84,3 @@ -keep class com.android.gallery3d.jpegstream.StreamUtils { *; } -# TODO: remove or rename android.util.Pools.java from our source. --dontwarn android.util.Pools* |