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

Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""

This commit is contained in:
Dan Willemsen 2018-02-09 19:22:13 +00:00 committed by Gerrit Code Review
parent 9f25d873bf 30d6869faf
commit 2744cbf190
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/static_java_library.mk
View File

@ -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.