From 30d6869faf6f288002d3d2181bc50e79ddc04fb2 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 9 Feb 2018 19:21:11 +0000
Subject: [PATCH] Revert "Propagate proguard rules from
 LOCAL_STATIC_ANDROID_LIBRARIES"

This reverts commit df5d7da7d8c141cf8b919c3c9556b99653589477.

Reason for revert: breaking builds

Bug: 72969557
Change-Id: I27aad65587933c3f760a89c541d27469c916abe8
---
 core/static_java_library.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 6ea5551ae..c1478f10d 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -119,13 +119,10 @@ endif
 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.