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

Commit 31af6fa8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to BP2A.250215.001 

Snap for 13070131 from fb93db63 to 25Q2-release

Change-Id: I216b3b5a68c4b6baefe266d8a726b4015b233328
parents 49b5b1e4 fb93db63

core/Makefile

+15 −0
Original line number Diff line number Diff line
@@ -1536,11 +1536,26 @@ boototapackage_4k: $(BUILT_BOOT_OTA_PACKAGE_4K) 
ifeq ($(BOARD_16K_OTA_MOVE_VENDOR),true)

$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_4K),$(TARGET_OUT_VENDOR)/boot_otas/boot_ota_4k.zip))

$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_16K),$(TARGET_OUT_VENDOR)/boot_otas/boot_ota_16k.zip))



ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT_VENDOR)/boot_otas/boot_ota_4k.zip

ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT_VENDOR)/boot_otas/boot_ota_16k.zip



ifneq ($(BOARD_VENDOR_KERNEL_MODULES_2ND_STAGE_16KB_MODE),)

# Add the modules that need to be loaded in the Second Boot Stage

# to /vendor_dlkm/lib/modules/16k-mode

VENDOR_DLKM_16K_MODE_DIR := lib/modules/16k-mode

$(foreach module,$(BOARD_VENDOR_KERNEL_MODULES_2ND_STAGE_16KB_MODE), \

    $(eval $(call copy-one-file,$(TARGET_KERNEL_DIR_16K)/$(module),\

                                $(TARGET_OUT_VENDOR_DLKM)/$(VENDOR_DLKM_16K_MODE_DIR)/$(module))))



ALL_DEFAULT_INSTALLED_MODULES += $(foreach module,$(BOARD_VENDOR_KERNEL_MODULES_2ND_STAGE_16KB_MODE),\

    $(TARGET_OUT_VENDOR_DLKM)/$(VENDOR_DLKM_16K_MODE_DIR)/$(module))

endif # BOARD_VENDOR_KERNEL_MODULES_2ND_STAGE_16KB_MODE not empty



else

$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_4K),$(TARGET_OUT)/boot_otas/boot_ota_4k.zip))

$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_16K),$(TARGET_OUT)/boot_otas/boot_ota_16k.zip))



ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT)/boot_otas/boot_ota_4k.zip

ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT)/boot_otas/boot_ota_16k.zip

endif # BOARD_16K_OTA_MOVE_VENDOR == true

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=BP2A.250214.004
 
BUILD_ID=BP2A.250215.001

core/config_sanitizers.mk

+3 −3
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ endif 
ifneq ($(filter memtag_stack,$(my_sanitize)),)

  my_cflags += -fsanitize=memtag-stack

  my_ldflags += -fsanitize=memtag-stack

  my_cflags += -march=armv8a+memtag

  my_ldflags += -march=armv8a+memtag

  my_asflags += -march=armv8a+memtag

  my_cflags += -Xclang -target-feature -Xclang +mte

  my_ldflags += -Xclang -target-feature -Xclang +mte

  my_asflags += -Xclang -target-feature -Xclang +mte

  my_sanitize := $(filter-out memtag_stack,$(my_sanitize))

endif

core/ninja_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ PARSE_TIME_MAKE_GOALS := \ 
	build-art% \

	build_kernel-nodeps \

	clean-oat% \

	cts \

	custom_images \

	dicttool_aosp \

	docs \

core/soong_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  $(call add_json_bool, AbOtaUpdater, $(filter true,$(AB_OTA_UPDATER)))

  $(call add_json_list, AbOtaPartitions, $(AB_OTA_PARTITIONS))

  $(call add_json_list, AbOtaKeys, $(PRODUCT_OTA_PUBLIC_KEYS))

  $(call add_json_list, AbOtaPostInstallConfig, $(AB_OTA_POSTINSTALL_CONFIG))



  # Avb (android verified boot) stuff

  $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))
@@ -566,6 +567,8 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  $(call add_json_str, ProductQuotaProjid, $(PRODUCT_QUOTA_PROJID))

  $(call add_json_str, ProductFsCompression, $(PRODUCT_FS_COMPRESSION))



  $(call add_json_str, ReleaseToolsExtensionDir, $(firstword $(TARGET_RELEASETOOLS_EXTENSIONS) $($(TARGET_DEVICE_DIR)/../common)))



$(call end_json_map)



# For converting vintf_data