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

Commit 50863edc authored by Cole Faust's avatar Cole Faust
Browse files

Don't dist SYMBOLS_ZIP in make on unbundled builds

Soong will now handle this. This requires that all unbundled builds
only build unbundled soong-built modules.

Also remove references to $(COVERAGE_ZIP) that I missed when I removed
its main build rule in ag/33260010.

Bug: 413145177
Test: COVERAGE_MODULES="ADBD" TARGET_RELEASE=mainline_2025_06 TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86_64 MODULE_RELEASED_PLATFORM=R ./vendor/google/build/build_unbundled_coverage_mainline_module.sh, and then compared the disted ADBD-symbols.zip.
Change-Id: I92d8a687abb4aa7ce1fc6cb8979c75036eb3ab0a
parent f5d7f1dc
Loading
Loading
Loading
Loading
+7 −9
Original line number Diff line number Diff line
@@ -7235,6 +7235,9 @@ $(foreach suite,$(ALL_COMPATIBILITY_SUITES),$(eval $(call create-suite-symbols-m
# a stack trace frame.
#

# The symbols.zip for unbundled builds is built with soong
ifeq (,$(TARGET_BUILD_UNBUNDLED))

name := $(TARGET_PRODUCT)
ifeq ($(TARGET_BUILD_TYPE),debug)
  name := $(name)_debug
@@ -7246,12 +7249,7 @@ SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name)-symbols.zip
SYMBOLS_MAPPING := $(PRODUCT_OUT)/$(name)-symbols-mapping.textproto
.KATI_READONLY := SYMBOLS_ZIP SYMBOLS_MAPPING

ifeq (,$(TARGET_BUILD_UNBUNDLED))
_symbols_zip_modules := $(call product-installed-modules,$(INTERNAL_PRODUCT))
  $(SYMBOLS_ZIP): $(updater_dep)
else
  _symbols_zip_modules := $(unbundled_build_modules)
endif

_symbols_zip_modules_symbols_files := $(foreach m,$(_symbols_zip_modules),$(ALL_MODULES.$(m).SYMBOLIC_OUTPUT_PATH))
_symbols_zip_modules_mapping_files := $(foreach m,$(_symbols_zip_modules),$(ALL_MODULES.$(m).ELF_SYMBOL_MAPPING_PATH))
@@ -7270,13 +7268,13 @@ $(SYMBOLS_ZIP): $(SOONG_ZIP) $(SYMBOLS_MAP) $(_symbols_zip_modules_symbols_files
$(SYMBOLS_ZIP): .KATI_IMPLICIT_OUTPUTS := $(SYMBOLS_MAPPING)

$(call declare-1p-container,$(SYMBOLS_ZIP),)
ifeq (,$(TARGET_BUILD_UNBUNDLED))
$(call declare-container-license-deps,$(SYMBOLS_ZIP),$(PRIVATE_SYMBOLS_MODULES_FILES) $(updater_dep),$(PRODUCT_OUT)/:/)
endif
$(call declare-container-license-deps,$(SYMBOLS_ZIP),$(PRIVATE_SYMBOLS_MODULES_FILES),$(PRODUCT_OUT)/:/)

_symbols_zip_modules_symbols_files :=
_symbols_zip_modules_mapping_files :=

endif # ifeq (,$(TARGET_BUILD_UNBUNDLED))

ifeq (true,$(EMMA_INSTRUMENT))
#------------------------------------------------------------------
# An archive of classes for use in generating code-coverage reports
+1 −8
Original line number Diff line number Diff line
@@ -1496,13 +1496,7 @@ else ifneq ($(TARGET_BUILD_APPS),)
  $(call dist-for-goals-with-filenametag,apps_only, $(PROGUARD_USAGE_ZIP))
  $(call declare-container-license-deps,$(PROGUARD_USAGE_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)

  $(SYMBOLS_ZIP) : $(apps_only_installed_files)
  $(call dist-for-goals-with-filenametag,apps_only, $(SYMBOLS_ZIP) $(SYMBOLS_MAPPING))
  $(call declare-container-license-deps,$(SYMBOLS_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)

  $(COVERAGE_ZIP) : $(apps_only_installed_files)
  $(call dist-for-goals,apps_only, $(COVERAGE_ZIP))
  $(call declare-container-license-deps,$(COVERAGE_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)
  # some more files are disted in soong's unbundled_builder module

apps_only: $(unbundled_build_modules)

@@ -1557,7 +1551,6 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE))

  $(call dist-for-goals, droidcore-unbundled, \
    $(INTERNAL_OTA_METADATA) \
    $(COVERAGE_ZIP) \
    $(INSTALLED_FILES_FILE) \
    $(INSTALLED_FILES_JSON) \
    $(INSTALLED_FILES_FILE_VENDOR) \