summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing Wang <wangying@android.com>2015-12-16 20:01:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-12-16 20:01:56 +0000
commit3de8900ffcf8c6092575c03b748cf163ec0ec232 (patch)
tree993fa97dd30464d4cecc4fe2335ae0c49078d942
parent78e347b20fb85ea18857a0c2db749f4ecd2b683e (diff)
parenta6d029fde3419625f6762eb115e209f8e221b089 (diff)
downloadGallery2-3de8900ffcf8c6092575c03b748cf163ec0ec232.tar.gz
Merge "Fix ProGuard error." am: 42cb024cff
am: a6d029fde3 * commit 'a6d029fde3419625f6762eb115e209f8e221b089': Fix ProGuard error.
-rw-r--r--proguard.flags4
1 files changed, 4 insertions, 0 deletions
diff --git a/proguard.flags b/proguard.flags
index 53693c12b..c8ba2ffad 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -82,3 +82,7 @@
-keep class com.android.gallery3d.jpegstream.JPEGOutputStream { *; }
-keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; }
-keep class com.android.gallery3d.jpegstream.StreamUtils { *; }
+
+
+# TODO: remove or rename android.util.Pools.java from our source.
+-dontwarn android.util.Pools*