Merge "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"

am: 13d389ad16

Change-Id: Ic6f02cc5bfde13242b7cff2734c3b4406d42d036
This commit is contained in:
Dan Willemsen
2018-02-09 18:14:15 +00:00
committed by android-build-merger

View File

@@ -119,10 +119,13 @@ endif
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.