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

Commit 8c4b4235 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to BP3A.250503.001 

Snap for 13442527 from 1e510c76 to 25Q3-release

Change-Id: Iab1bb8f26397c1a4db363046d69e50bd863394cb
parents fc0aae8e 1e510c76

core/Makefile

+10 −12
Original line number Diff line number Diff line
@@ -2328,9 +2328,9 @@ $(if $(BOARD_AVB_ENABLE), \ 
  $(if $(filter $(2),system_other), \

    $(hide) echo "avb_system_other_hashtree_enable=$(BOARD_AVB_ENABLE)" >> $(1)$(newline) \

    $(hide) echo "avb_system_other_add_hashtree_footer_args=$(BOARD_AVB_SYSTEM_OTHER_ADD_HASHTREE_FOOTER_ARGS)" >> $(1)$(newline) \

    $(if $(BOARD_AVB_SYSTEM_OTHER_KEY_PATH),\

      $(hide) echo "avb_system_other_key_path=$(BOARD_AVB_SYSTEM_OTHER_KEY_PATH)" >> $(1)$(newline) \

      $(hide) echo "avb_system_other_algorithm=$(BOARD_AVB_SYSTEM_OTHER_ALGORITHM)" >> $(1)$(newline))) \

    $(if $(BOARD_AVB_SYSTEM_KEY_PATH),\

      $(hide) echo "avb_system_other_key_path=$(BOARD_AVB_SYSTEM_KEY_PATH)" >> $(1)$(newline) \

      $(hide) echo "avb_system_other_algorithm=$(BOARD_AVB_SYSTEM_ALGORITHM)" >> $(1)$(newline))) \

  $(if $(filter $(2),vendor), \

    $(hide) echo "avb_vendor_hashtree_enable=$(BOARD_AVB_ENABLE)" >> $(1)$(newline) \

    $(hide) echo "avb_vendor_add_hashtree_footer_args=$(BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS)" >> $(1)$(newline) \
@@ -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

core/android_soong_config_vars.mk

+4 −0
Original line number Diff line number Diff line
@@ -263,6 +263,10 @@ $(call soong_config_set,bootclasspath,release_package_profiling_module,$(RELEASE 
# Move VCN from platform to the Tethering module; used by both platform and module

$(call soong_config_set,ANDROID,is_vcn_in_mainline,$(RELEASE_MOVE_VCN_TO_MAINLINE))



# Add telephony build flag to soong

$(call soong_config_set,ANDROID,release_telephony_module,$(RELEASE_TELEPHONY_MODULE))

$(call soong_config_set,bootclasspath,release_telephony_module,$(RELEASE_TELEPHONY_MODULE))



# Add perf-setup build flag to soong

# Note: BOARD_PERFSETUP_SCRIPT location must be under platform_testing/scripts/perf-setup/.

ifdef BOARD_PERFSETUP_SCRIPT

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID=BP3A.250502.003
 
BUILD_ID=BP3A.250503.001

core/main.mk

+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) \

core/product_config.mk

+13 −0
Original line number Diff line number Diff line
@@ -276,6 +276,19 @@ ifneq ($(ALLOW_RULES_IN_PRODUCT_CONFIG),) 
_product_config_saved_KATI_ALLOW_RULES :=

endif



# Sort/dedup all PRODUCT_PACKAGES variables. This is every PRODUCT_PACKAGES_* variable that appears

# in product-installed-modules.

PRODUCT_PACKAGES := $(sort $(PRODUCT_PACKAGES))

PRODUCT_PACKAGES_DEBUG := $(sort $(PRODUCT_PACKAGES_DEBUG))

PRODUCT_PACKAGES_ENG := $(sort $(PRODUCT_PACKAGES_ENG))

PRODUCT_PACKAGES_TESTS := $(sort $(PRODUCT_PACKAGES_TESTS))

PRODUCT_PACKAGES_DEBUG_ASAN := $(sort $(PRODUCT_PACKAGES_DEBUG_ASAN))

PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE := $(sort $(PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE))

PRODUCT_PACKAGES_ARM64 := $(sort $(PRODUCT_PACKAGES_ARM64))

PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 := $(sort $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29))

PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33 := $(sort $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33))

PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 := $(sort $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34))



############################################################################



current_product_makefile :=