tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow Soong to export multiple proguard flags files"

Browse source 
am: 36bf0df48f

Change-Id: If220f5ff46aec61971e40e3097b5a6d2d1a9bc0d
This commit is contained in:
android-build-prod (mdb) 2018-04-30 18:18:42 -07:00 committed by android-build-merger
commit 43b310f301
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/soong_java_prebuilt.mk
View file

@ -40,21 +40,26 @@ ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
$(intermediates.COMMON)/jacoco-report-classes.jar)
endif
ifdef LOCAL_SOONG_EXPORT_PROGUARD_FLAGS
$(eval $(call copy-one-file,$(LOCAL_SOONG_EXPORT_PROGUARD_FLAGS),\
$(intermediates.COMMON)/export_proguard_flags))
$(call add-dependency,$(LOCAL_BUILT_MODULE),\
$(intermediates.COMMON)/export_proguard_flags)
endif
ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
my_res_package := $(intermediates.COMMON)/package-res.apk
my_res_package := $(intermediates.COMMON)/package-res.apk
$(my_res_package): $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE)
$(my_res_package): $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE)
@echo "Copy: $@"
$(copy-file-to-target)
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_res_package))
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_res_package))
my_proguard_flags := $(intermediates.COMMON)/export_proguard_flags
$(my_proguard_flags): $(LOCAL_SOONG_EXPORT_PROGUARD_FLAGS)
@echo "Export proguard flags: $@"
rm -f $@
touch $@
for f in $+; do \
echo -e "\n# including $$f" >>$@; \
cat $$f >>$@; \
done
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_proguard_flags))
endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE