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

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

Make change and version bump to BP2A.250313.001 

Snap for 13204655 from 1b102291 to 25Q2-release

Change-Id: Id922731239e86944025dc9bf05ec11f013e35c6e
parents 566879e1 1b102291

core/base_rules.mk

+16 −0
Original line number Diff line number Diff line
@@ -214,6 +214,22 @@ else 
  actual_partition_tag := $(if $(partition_tag),data,system)

endif

endif



# if this is a soong module, verify that LOCAL_COMPATIBILITY_SUITE (legacy) matches

# LOCAL_SOONG_PROVIDER_TEST_SUITES (new, via TestSuiteInfoProvider instead of AndroidMk stuff),

# modulo "null-sute", "mts", and "mcts". mts/mcts are automatically added if there's a different

# suite starting with "m(c)ts-". null-suite seems useless and is sometimes automatically added

# if no other suites are added.

ifneq (,$(filter $(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)))

  a := $(filter-out null-suite mts mcts,$(sort $(LOCAL_COMPATIBILITY_SUITE)))

  b := $(filter-out null-suite mts mcts,$(sort $(LOCAL_SOONG_PROVIDER_TEST_SUITES)))

  ifneq ($(a),$(b))

    $(error $(LOCAL_MODULE): LOCAL_COMPATIBILITY_SUITE did not match LOCAL_SOONG_PROVIDER_TEST_SUITES$(newline)  LOCAL_COMPATIBILITY_SUITE: $(a)$(newline)  LOCAL_SOONG_PROVIDER_TEST_SUITES: $(b)$(newline))

  endif

  a :=

  b :=

endif



# For test modules that lack a suite tag, set null-suite as the default.

# We only support adding a default suite to native tests, native benchmarks, and instrumentation tests.

# This is because they are the only tests we currently auto-generate test configs for.

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.250312.003
 
BUILD_ID=BP2A.250313.001

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ LOCAL_SOONG_MODULE_INFO_JSON := 
LOCAL_SOONG_MODULE_TYPE :=

LOCAL_SOONG_PROGUARD_DICT :=

LOCAL_SOONG_PROGUARD_USAGE_ZIP :=

LOCAL_SOONG_PROVIDER_TEST_SUITES :=

LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=

LOCAL_SOONG_TRANSITIVE_RES_PACKAGES :=

LOCAL_SOONG_DEVICE_RRO_DIRS :=

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  $(call add_json_bool, ProductUseDynamicPartitions, $(filter true,$(PRODUCT_USE_DYNAMIC_PARTITIONS)))

  $(call add_json_bool, ProductRetrofitDynamicPartitions, $(filter true,$(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS)))

  $(call add_json_bool, ProductBuildSuperPartition, $(filter true,$(PRODUCT_BUILD_SUPER_PARTITION)))

  $(call add_json_bool, BuildingSuperEmptyImage, $(filter true,$(BUILDING_SUPER_EMPTY_IMAGE)))

  $(call add_json_str, BoardSuperPartitionSize, $(BOARD_SUPER_PARTITION_SIZE))

  $(call add_json_str, BoardSuperPartitionMetadataDevice, $(BOARD_SUPER_PARTITION_METADATA_DEVICE))

  $(call add_json_list, BoardSuperPartitionBlockDevices, $(BOARD_SUPER_PARTITION_BLOCK_DEVICES))

tools/aconfig/aconfig/src/codegen/java.rs

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ where 
    let runtime_lookup_required =

        flag_elements.iter().any(|elem| elem.is_read_write) || library_exported;

    let container = (flag_elements.first().expect("zero template flags").container).to_string();

    let is_platform_container = matches!(container.as_str(), "system" | "product" | "vendor");

    let is_platform_container =

        matches!(container.as_str(), "system" | "system_ext" | "product" | "vendor");

    let context = Context {

        flag_elements,

        namespace_flags,