• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoawindowspythonrubyphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdombtronvb.netdirectxarduinopreviewerゲームエンジン

packages/apps/Gallery2


Commit MetaInfo

Révisionab8fa0fe17ae7a24feae54efc070d90628ed4bbd (tree)
l'heure2018-04-06 02:53:51
AuteurTreeHugger Robot <treehugger-gerrit@goog...>
CommiterAndroid (Google) Code Review

Message de Log

Merge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-dev

Change Summary

Modification

--- a/Android.mk
+++ b/Android.mk
@@ -39,6 +39,8 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
3939
4040 LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
4141
42+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
43+
4244 include $(BUILD_PACKAGE)
4345
4446 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
--- /dev/null
+++ b/jarjar-rules.txt
@@ -0,0 +1 @@
1+rule android.util.Pools** com.android.photos.util.Pools@1
--- a/proguard.flags
+++ b/proguard.flags
@@ -84,5 +84,3 @@
8484 -keep class com.android.gallery3d.jpegstream.StreamUtils { *; }
8585
8686
87-# TODO: remove or rename android.util.Pools.java from our source.
88--dontwarn android.util.Pools*