Merge "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES" am: 13d389ad16
am: 02a56631d9
Change-Id: I3f89c666b4d3e016cc87d98ebb5a8911210c624e
diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index c1478f1..6ea5551 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -119,10 +119,13 @@
endif
ifdef LOCAL_USE_AAPT2
-$(intermediates.COMMON)/export_proguard_flags: $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))
+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))
@echo "Export proguard flags: $@"
rm -f $@
cat $+ >$@
+import_proguard_flag_files :=
endif
# add --non-constant-id to prevent inlining constants.