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

Commit f4358382 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "Dist unbundled proguard zips with soong"" into main

parents c8ad3629 f6317dcb

core/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -7318,12 +7318,14 @@ 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
@@ -7386,6 +7388,7 @@ 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
@@ -7449,8 +7452,6 @@ $(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

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