Loading core/static_java_library.mk +9 −2 Original line number Diff line number Diff line Loading @@ -119,10 +119,17 @@ 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 $+ >$@ touch $@ for f in $+; do \ echo -e "\n# including $$f" >>$@; \ cat $$f >>$@; \ done import_proguard_flag_files := endif # add --non-constant-id to prevent inlining constants. Loading Loading
core/static_java_library.mk +9 −2 Original line number Diff line number Diff line Loading @@ -119,10 +119,17 @@ 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 $+ >$@ touch $@ for f in $+; do \ echo -e "\n# including $$f" >>$@; \ cat $$f >>$@; \ done import_proguard_flag_files := endif # add --non-constant-id to prevent inlining constants. Loading