commit 5e81ce7c5b4bff6f21eb7691f69f5dd4905d1d49
author Dan Willemsen <dwillemsen@google.com> Fri Feb 09 19:49:24 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 09 19:49:24 2018 +0000
tree ba5282e52c8056ad9fe8897c2eb31d4297b88ba1
parent 330670267ecc38f8e2f3cc4b2517787ba9ee39d7
parent ea121f2a9abcd1208c49b84c8d51fc5fb7d4bbb7

Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" am: 2744cbf190 am: 22eb731606
am: ea121f2a9a

Change-Id: Ib5ccf90b64ff78cad702d7b91e8db51ec68d054a

core/static_java_library.mk

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 9f097a3..c3dd634 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -119,13 +119,10 @@
 endif
 
 ifdef LOCAL_USE_AAPT2
-import_proguard_flag_files := $(strip $(foreach l,$(LOCAL_STATIC_ANDROID_LIBRARIES),\
-    $(call intermediates-dir-for,JAVA_LIBRARIES,$(l),,COMMON)/export_proguard_flags))
-$(intermediates.COMMON)/export_proguard_flags: $(import_proguard_flag_files) $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))
+$(intermediates.COMMON)/export_proguard_flags: $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))
 	@echo "Export proguard flags: $@"
 	rm -f $@
 	cat $+ >$@
-import_proguard_flag_files :=
 endif
 
 # add --non-constant-id to prevent inlining constants.