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

Commit f1173425 authored by Cole Faust's avatar Cole Faust
Browse files

Dist unbundled proguard zips with soong 

For soong-only builds.

Bug: 413145177
Test: COVERAGE_MODULES="DOCUMENTSUI" 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
Change-Id: If4b3af39cf964115c5e828cef39278368343b894
parent 25cf2180

core/Makefile

+5 −6
Original line number Diff line number Diff line
@@ -7318,14 +7318,12 @@ endif # EMMA_INSTRUMENT=true 
# finding the appropriate dictionary to deobfuscate a stack trace frame.

#



# The proguard zips for unbundled builds are built with soong

ifeq (,$(TARGET_BUILD_UNBUNDLED))



_proguard_dict_zip_modules := $(call product-installed-modules,$(INTERNAL_PRODUCT))

else

  _proguard_dict_zip_modules := $(unbundled_build_modules)

endif



# Filter out list to avoid uncessary proguard related file generation

ifeq (,$(TARGET_BUILD_UNBUNDLED))

filter_out_proguard_dict_zip_modules :=

# product.img

ifndef BUILDING_PRODUCT_IMAGE
@@ -7388,7 +7386,6 @@ endef 


# Filter out proguard dict zip modules those are not installed at the built image

_proguard_dict_zip_modules := $(foreach m,$(_proguard_dict_zip_modules),$(strip $(call filter-out-proguard-modules,$(m))))

endif



# The path to the zip file containing proguard dictionaries.

PROGUARD_DICT_ZIP :=$= $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict.zip
@@ -7452,6 +7449,8 @@ $(call declare-container-license-deps,$(PROGUARD_USAGE_ZIP),$(INSTALLED_SYSTEMIM 
    $(updater_dep),$(PROGUARD_USAGE_ZIP):/)

endif



endif # ifeq (,$(TARGET_BUILD_UNBUNDLED))



ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))



# Dump variables used by build_super_image.py (for building super.img and super_empty.img).

core/main.mk

+0 −8
Original line number Diff line number Diff line
@@ -1480,14 +1480,6 @@ else ifneq ($(TARGET_BUILD_APPS),) 
    $(call dist-for-goals,apps_only, $(JACOCO_REPORT_CLASSES_ALL))

  endif



  $(PROGUARD_DICT_ZIP) : $(apps_only_installed_files)

  $(call dist-for-goals-with-filenametag,apps_only, $(PROGUARD_DICT_ZIP) $(PROGUARD_DICT_ZIP) $(PROGUARD_DICT_MAPPING))

  $(call declare-container-license-deps,$(PROGUARD_DICT_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)



  $(PROGUARD_USAGE_ZIP) : $(apps_only_installed_files)

  $(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)/:/)



  # some more files are disted in soong's unbundled_builder module



apps_only: $(unbundled_build_modules)