StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dist lint reports for apps

Browse Source 
Dist the transitive lint report for each unbundled app built by Soong
when lint-check is on the command line.

Bug: 153485543
Test: m TARGET_BUILD_APPS=Gallery2 lint-check dist
Change-Id: Icd2b6f884396fa5f743746099301c325ca82a324
This commit is contained in:
Colin Cross
2020-07-06 14:14:47 -07:00
parent faac5a2e7d
commit b842952421
3 changed files with 13 additions and 0 deletions
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_HEADER_JAR :=
LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR := LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
LOCAL_SOONG_LINK_TYPE := LOCAL_SOONG_LINK_TYPE :=
LOCAL_SOONG_LINT_REPORTS :=
LOCAL_SOONG_PROGUARD_DICT := LOCAL_SOONG_PROGUARD_DICT :=
LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE := LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
LOCAL_SOONG_DEVICE_RRO_DIRS := LOCAL_SOONG_DEVICE_RRO_DIRS :=

8
core/main.mk
View File

@@ -1617,6 +1617,14 @@ ifneq ($(TARGET_BUILD_APPS),)
$(if $(ALL_MODULES.$(m).BUNDLE),$(ALL_MODULES.$(m).BUNDLE):$(m)-base.zip)) $(if $(ALL_MODULES.$(m).BUNDLE),$(ALL_MODULES.$(m).BUNDLE):$(m)-base.zip))
$(call dist-for-goals,apps_only, $(apps_only_bundle_files)) $(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, # For uninstallable modules such as static Java library, we have to dist the built file,
# as <module_name>.<suffix> # as <module_name>.<suffix>
apps_only_dist_built_files := $(foreach m,$(unbundled_build_modules),$(if $(ALL_MODULES.$(m).INSTALLED),,\ apps_only_dist_built_files := $(foreach m,$(unbundled_build_modules),$(if $(ALL_MODULES.$(m).INSTALLED),,\

4
core/soong_app_prebuilt.mk
View File

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