commit ea121f2a9abcd1208c49b84c8d51fc5fb7d4bbb7
author Dan Willemsen <dwillemsen@google.com> Fri Feb 09 19:44:15 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 09 19:44:15 2018 +0000
tree 7cbb8898103de84de1c107cdd07c91981fc9a72b
parent af0a12eded2898f8340f20daf6b23468fe3d5a5e
parent 22eb7316064755d9e41647dc50881fde40302b3d

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

Change-Id: Ibfa7d19f060c28bf3f44ca284275f2d6c7c7e904

core/static_java_library.mk

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 6ea5551..c1478f1 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.