Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab8fa0fe authored Apr 05, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Apr 05, 2018

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

parents 915d04b4 e9eeb27e

Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,8 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags

	LOCAL_JAVA_LIBRARIES += org.apache.http.legacy		LOCAL_JAVA_LIBRARIES += org.apache.http.legacy

			LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt

	include $(BUILD_PACKAGE)		include $(BUILD_PACKAGE)

	ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)		ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)

jarjar-rules.txt

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			rule android.util.Pools** com.android.photos.util.Pools@1

proguard.flags

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -84,5 +84,3 @@
	-keep class com.android.gallery3d.jpegstream.StreamUtils { *; }		-keep class com.android.gallery3d.jpegstream.StreamUtils { *; }


	# TODO: remove or rename android.util.Pools.java from our source.
	-dontwarn android.util.Pools*