packages/apps/Gallery2
Révision | ab8fa0fe17ae7a24feae54efc070d90628ed4bbd (tree) |
---|---|
l'heure | 2018-04-06 02:53:51 |
Auteur | TreeHugger Robot <treehugger-gerrit@goog...> |
Commiter | Android (Google) Code Review |
Merge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-dev
@@ -39,6 +39,8 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags | ||
39 | 39 | |
40 | 40 | LOCAL_JAVA_LIBRARIES += org.apache.http.legacy |
41 | 41 | |
42 | +LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt | |
43 | + | |
42 | 44 | include $(BUILD_PACKAGE) |
43 | 45 | |
44 | 46 | ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),) |
@@ -0,0 +1 @@ | ||
1 | +rule android.util.Pools** com.android.photos.util.Pools@1 |
@@ -84,5 +84,3 @@ | ||
84 | 84 | -keep class com.android.gallery3d.jpegstream.StreamUtils { *; } |
85 | 85 | |
86 | 86 | |
87 | -# TODO: remove or rename android.util.Pools.java from our source. | |
88 | --dontwarn android.util.Pools* |