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

Commit cc355c3f authored by Cole Faust's avatar Cole Faust Committed by Android (Google) Code Review
Browse files

Revert "Dist unbundled module lint reports with soong" 

Revert submission 33377767-soong_only_unbundled_lint_reports

Reason for revert: Mistakenly removes errorprone dist in bundled builds

Reverted changes: /q/submissionid:33377767-soong_only_unbundled_lint_reports

Change-Id: Ibc1a2ebeb644d08ac63003df5a8a3c47916ca3f9
parent 7b6237b7

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ LOCAL_SOONG_INSTALLED_MODULE := 
LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=

LOCAL_SOONG_LICENSE_METADATA :=

LOCAL_SOONG_LINK_TYPE :=

LOCAL_SOONG_LINT_REPORTS :=

LOCAL_SOONG_LOGTAGS_FILES :=

LOCAL_SOONG_MODULE_INFO_JSON :=

LOCAL_SOONG_MODULE_TYPE :=

core/main.mk

+8 −0
Original line number Diff line number Diff line
@@ -1467,6 +1467,14 @@ else 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
@@ -207,6 +207,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