Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81e22595 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Dist lint reports for apps" am: d56abedb am: ec7b0b85 

Original change: https://android-review.googlesource.com/c/platform/build/+/1360938

Change-Id: I687efe1b63e316306dce9d3235470cb322e3ed20
parents 477d9828 ec7b0b85

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -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 :=

core/main.mk

+8 −0
Original line number Diff line number Diff line
@@ -1617,6 +1617,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),,\

core/soong_app_prebuilt.mk

+4 −0
Original line number Diff line number Diff line
@@ -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