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

Commit 1163139a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to BP2A.250212.001 

Snap for 13046591 from e5d4d4f8 to 25Q2-release

Change-Id: I8504dbff2c2ac513b63b7645d6b5119ecca0000b
parents fd0618e0 e5d4d4f8

core/Makefile

+40 −0
Original line number Diff line number Diff line
@@ -8074,6 +8074,46 @@ pack-migration-image: $(PACK_MIGRATION_IMAGE_TARGET) 


endif # ANDROID_DESKTOP_MIGRATION_IMAGE



ifdef SOONG_ONLY_ALL_IMAGES_ZIP



allimages_soong_zip_args :=

allimages_deps :=



define include_image

$(if $(1), \

  $(eval allimages_soong_zip_args += -e $(notdir $(1)) -f $(1)) \

  $(eval allimages_deps += $(1)))

endef



$(call include_image,$(INSTALLED_SUPERIMAGE_TARGET))

$(call include_image,$(INSTALLED_BOOTIMAGE_TARGET))

$(call include_image,$(INSTALLED_INIT_BOOT_IMAGE_TARGET))

$(call include_image,$(INSTALLED_VENDOR_BOOTIMAGE_TARGET))

$(call include_image,$(INSTALLED_USERDATAIMAGE_TARGET))

$(call include_image,$(INSTALLED_RECOVERYIMAGE_TARGET))

$(call include_image,$(INSTALLED_VBMETAIMAGE_TARGET))

$(call include_image,$(INSTALLED_VBMETA_SYSTEMIMAGE_TARGET))

$(call include_image,$(INSTALLED_VBMETA_VENDORIMAGE_TARGET))

$(foreach partition,$(call to-upper,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)), \

  $(call include_image,$(INSTALLED_VBMETA_$(partition)IMAGE_TARGET)))



allimages_zip := $(PRODUCT_OUT)/all_images.zip

$(allimages_zip): PRIVATE_SOONG_ZIP_ARGUMENTS := $(allimages_soong_zip_args)

$(allimages_zip): $(SOONG_ZIP) $(allimages_deps)

	$(SOONG_ZIP) -o $@ --sort_entries $(PRIVATE_SOONG_ZIP_ARGUMENTS)



.PHONY: soong_only_diff_test

soong_only_diff_test: PRIVATE_ALLIMAGES_ZIP := $(allimages_zip)

soong_only_diff_test: $(allimages_zip) $(SOONG_ONLY_ALL_IMAGES_ZIP)

	diff $(PRIVATE_ALLIMAGES_ZIP) $(SOONG_ONLY_ALL_IMAGES_ZIP)



allimages_soong_zip_args :=

allimages_deps :=

allimages_zip :=

include_image :=



endif # ifdef SOONG_ONLY_ALL_IMAGES_ZIP



# -----------------------------------------------------------------

# OS Licensing

core/android_soong_config_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ $(call add_soong_config_var,ANDROID,BOARD_GENFS_LABELS_VERSION) 
$(call soong_config_set_bool,ANDROID,PRODUCT_FSVERITY_GENERATE_METADATA,$(if $(filter true,$(PRODUCT_FSVERITY_GENERATE_METADATA)),true,false))



$(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))

$(call add_soong_config_var,ANDROID,TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS)



# For BUILDING_GSI

$(call soong_config_set_bool,gsi,building_gsi,$(if $(filter true,$(BUILDING_GSI)),true,false))

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.250211.001
 
BUILD_ID=BP2A.250212.001

target/board/generic_arm64/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ include build/make/target/board/BoardConfigGsiCommon.mk 
BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp

BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist

BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware

# for Android.bp

TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS := true



# TODO(b/36764215): remove this setting when the generic system image

# no longer has QCOM-specific directories under /.

target/board/generic_arm64_plus_armv7/BoardConfig.mk

0 → 100644
+55 −0
Original line number Diff line number Diff line 
# Copyright (C) 2025 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



# arm64 emulator specific definitions

TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a

TARGET_CPU_VARIANT := generic

TARGET_CPU_ABI := arm64-v8a



TARGET_2ND_ARCH := arm

TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi



# DO NOT USE

# DO NOT USE

#

# This architecture / CPU variant must NOT be used for any 64 bit

# platform builds. It is the lowest common denominator required

# to build an unbundled application or cts for all supported 32 and 64 bit

# platforms.

#

# If you're building a 64 bit platform (and not an application) the

# ARM-v8 specification allows you to assume all the features available in an

# armv7-a-neon CPU. You should set the following as 2nd arch/cpu variant:

#

# TARGET_2ND_ARCH_VARIANT := armv8-a

# TARGET_2ND_CPU_VARIANT := generic

#

# DO NOT USE

# DO NOT USE

TARGET_2ND_ARCH_VARIANT := armv7-a-neon

# DO NOT USE

# DO NOT USE

TARGET_2ND_CPU_VARIANT := generic

# DO NOT USE

# DO NOT USE



# Include 64-bit mediaserver to support 64-bit only devices

TARGET_DYNAMIC_64_32_MEDIASERVER := true

# Include 64-bit drmserver to support 64-bit only devices

TARGET_DYNAMIC_64_32_DRMSERVER := true



include build/make/target/board/BoardConfigGsiCommon.mk