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

Commit 3ad27300 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to BP3A.250514.001 

Snap for 13488884 from 820de7d6 to 25Q3-release

Change-Id: Ifb450986b3c90151aeaffe3a28713cf36312c7fb
parents 96d5aceb 820de7d6

core/android_soong_config_vars.mk

+0 −4
Original line number Diff line number Diff line
@@ -263,10 +263,6 @@ $(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/base_rules.mk

+6 −11
Original line number Diff line number Diff line
@@ -505,8 +505,12 @@ my_path_comp := 


my_installed_symlinks :=



ifeq (,$(LOCAL_SOONG_INSTALLED_MODULE))

ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE))

  # Soong already generated the copy rule, but make the installed location depend on the Make

  # copy of the intermediates for now, as some rules that collect intermediates may expect

  # them to exist.

  $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

else ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

  $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

  $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

	@echo "Install: $@"
@@ -526,7 +530,6 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) 
  $(my_all_targets) : | $(my_installed_symlinks)



endif # !LOCAL_UNINSTALLABLE_MODULE

endif # !LOCAL_SOONG_INSTALLED_MODULE



# Add dependencies on LOCAL_SOONG_INSTALL_SYMLINKS if we're installing any kind of module, not just

# ones that set LOCAL_SOONG_INSTALLED_MODULE. This is so we can have a soong module that only
@@ -999,14 +1002,6 @@ ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE)) 
      $(my_installed_test_data) \

      $(my_vintf_installed))



  ifneq (,$(LOCAL_IS_HOST_MODULE))

    ALL_MODULES.$(my_register_name).HOST_INSTALLED := \

    $(strip $(ALL_MODULES.$(my_register_name).HOST_INSTALLED) \

      $(foreach f, $(LOCAL_SOONG_INSTALL_PAIRS),\

        $(word 2,$(subst :,$(space),$(f)))) \

      $(LOCAL_SOONG_INSTALL_SYMLINKS))

  endif



  ALL_MODULES.$(my_register_name).INSTALLED_SYMLINKS := $(LOCAL_SOONG_INSTALL_SYMLINKS)



  # Store the list of colon-separated pairs of the built and installed locations

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.250513.002
 
BUILD_ID=BP3A.250514.001

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ $(foreach m,$(ALL_MODULES), \ 
  $(if $(r), \

    $(eval r := $(call module-installed-files,$(r))) \

    $(eval t_m := $(filter $(TARGET_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval t_m := $(filter-out $(ALL_MODULES.$(m).ORDERONLY_INSTALLED) $(ALL_MODULES.$(m).HOST_INSTALLED), $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval t_m := $(filter-out $(ALL_MODULES.$(m).ORDERONLY_INSTALLED), $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval t_r := $(filter $(TARGET_OUT_ROOT)/%, $(r))) \

    $(eval t_r := $(filter-out $(t_m), $(t_r))) \

    $(if $(t_m), $(eval $(call add-required-deps, $(t_m),$(t_r)))) \

core/product_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ current_product_makefile := 
# TODO(b/308187268): Remove this denylist mechanism

# Use PRODUCT_PACKAGES to determine if this is an aosp product. aosp products do not use google signed apexes.

ignore_apex_contributions :=

ifeq (,$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))$(findstring com.google.android.go.conscrypt,$(PRODUCT_PACKAGES)))

ifeq (,$(filter com.google.android.conscrypt com.google.android.go.conscrypt com.google.android.extservices com.google.android.go.extservices,$(PRODUCT_PACKAGES)))

  ignore_apex_contributions := true

endif

ifeq (true,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))