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

Merge "Dist lint reports for apps"

Browse source
This commit is contained in:
Colin Cross 2020-07-16 23:06:22 +00:00 committed by Gerrit Code Review
commit d56abedb02
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/clear_vars.mk
View file

@ -273,6 +273,7 @@ LOCAL_SOONG_EXPORT_PROGUARD_FLAGS :=
LOCAL_SOONG_HEADER_JAR :=
LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
LOCAL_SOONG_LINK_TYPE :=
LOCAL_SOONG_LINT_REPORTS :=
LOCAL_SOONG_PROGUARD_DICT :=
LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
LOCAL_SOONG_DEVICE_RRO_DIRS :=

8
core/main.mk
View file

@ -1615,6 +1615,14 @@ ifneq ($(TARGET_BUILD_APPS),)
$(if $(ALL_MODULES.$(m).BUNDLE),$(ALL_MODULES.$(m).BUNDLE):$(m)-base.zip))
$(call dist-for-goals,apps_only, $(apps_only_bundle_files))
# Dist the lint reports if they exist.
apps_only_lint_report_files := $(foreach m,$(unbundled_build_modules),\
$(foreach report,$(ALL_MODULES.$(m).LINT_REPORTS),\
$(report):$(m)-$(notdir $(report))))
.PHONY: lint-check
lint-check: $(foreach f, $(apps_only_lint_report_files), $(call word-colon,1,$(f)))
$(call dist-for-goals,lint-check, $(apps_only_lint_report_files))
# For uninstallable modules such as static Java library, we have to dist the built file,
# as <module_name>.<suffix>
apps_only_dist_built_files := $(foreach m,$(unbundled_build_modules),$(if $(ALL_MODULES.$(m).INSTALLED),,\

4
core/soong_app_prebuilt.mk
View file

@ -176,6 +176,10 @@ ifdef LOCAL_SOONG_BUNDLE
ALL_MODULES.$(my_register_name).BUNDLE := $(LOCAL_SOONG_BUNDLE)
endif
ifdef LOCAL_SOONG_LINT_REPORTS
ALL_MODULES.$(my_register_name).LINT_REPORTS := $(LOCAL_SOONG_LINT_REPORTS)
endif
ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_SDK_VERSION),system_current)
my_link_type := java:system