Loading core/Makefile +5 −6 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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 Loading Loading @@ -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). Loading core/build_id.mk +1 −1 Original line number Diff line number Diff line Loading @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. BUILD_ID=BP3A.250507.002 BUILD_ID=BP3A.250508.001 core/main.mk +0 −8 Original line number Diff line number Diff line Loading @@ -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) Loading target/product/handheld_system_ext.mk +0 −3 Original line number Diff line number Diff line Loading @@ -30,6 +30,3 @@ PRODUCT_PACKAGES += \ StorageManager \ SystemUI \ WallpaperCropper \ # Allowlist for system packages included in handheld_system_ext.mk PRODUCT_PACKAGES += preinstalled_packages_handheld_system_ext.xml target/product/sysconfig/Android.bp +0 −7 Original line number Diff line number Diff line Loading @@ -55,13 +55,6 @@ prebuilt_etc { src: "preinstalled-packages-platform-telephony-product.xml", } prebuilt_etc { name: "preinstalled_packages_handheld_system_ext.xml", sub_dir: "sysconfig", system_ext_specific: true, src: "preinstalled_packages_handheld_system_ext.xml", } prebuilt_etc { name: "initial-package-stopped-states-aosp.xml", product_specific: true, Loading Loading
core/Makefile +5 −6 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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 Loading Loading @@ -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). Loading
core/build_id.mk +1 −1 Original line number Diff line number Diff line Loading @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. BUILD_ID=BP3A.250507.002 BUILD_ID=BP3A.250508.001
core/main.mk +0 −8 Original line number Diff line number Diff line Loading @@ -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) Loading
target/product/handheld_system_ext.mk +0 −3 Original line number Diff line number Diff line Loading @@ -30,6 +30,3 @@ PRODUCT_PACKAGES += \ StorageManager \ SystemUI \ WallpaperCropper \ # Allowlist for system packages included in handheld_system_ext.mk PRODUCT_PACKAGES += preinstalled_packages_handheld_system_ext.xml
target/product/sysconfig/Android.bp +0 −7 Original line number Diff line number Diff line Loading @@ -55,13 +55,6 @@ prebuilt_etc { src: "preinstalled-packages-platform-telephony-product.xml", } prebuilt_etc { name: "preinstalled_packages_handheld_system_ext.xml", sub_dir: "sysconfig", system_ext_specific: true, src: "preinstalled_packages_handheld_system_ext.xml", } prebuilt_etc { name: "initial-package-stopped-states-aosp.xml", product_specific: true, Loading