openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""" am: 5fdae96b06 

am: 1964dbc6ad

Change-Id: I6c73171efc7e741338bea0bd9cc2632be93a10e6
This commit is contained in:
Dan Willemsen 2018-02-17 04:10:02 +00:00 committed by android-build-merger
parent aa582f7dda 1964dbc6ad
commit 6bd3e1f31c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/static_java_library.mk
View File

@ -119,10 +119,17 @@ endif
endif endif
ifdef LOCAL_USE_AAPT2 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: $@" @echo "Export proguard flags: $@"
rm -f $@ rm -f $@
cat $+ >$@ touch $@
for f in $+; do \
echo -e "\n# including $$f" >>$@; \
cat $$f >>$@; \
done
import_proguard_flag_files :=
endif endif
# add --non-constant-id to prevent inlining constants. # add --non-constant-id to prevent inlining constants.