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

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

Make change and version bump to BP3A.250430.001 

Snap for 13424156 from cdac0a6c to 25Q3-release

Change-Id: I0fa3c2790c9a42188debe778ee59f50fb9742fa6
parents caeafc2d cdac0a6c

core/OWNERS

+2 −0
Original line number Diff line number Diff line
@@ -11,3 +11,5 @@ per-file version_defaults.mk = amhk@google.com,gurpreetgs@google.com,mkhokhlova@ 
# For Ravenwood test configs

per-file ravenwood_test_config_template.xml =omakoto@google.com



# For ART configuration.

per-file art_config.mk = file:platform/art:main:/OWNERS

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.250429.003
 
BUILD_ID=BP3A.250430.001

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -1309,7 +1309,7 @@ BUILD_THUMBPRINT_FILE := $(PRODUCT_OUT)/build_thumbprint.txt 
ifeq ($(strip $(HAS_BUILD_NUMBER)),true)

$(BUILD_THUMBPRINT_FILE): $(BUILD_NUMBER_FILE)

endif

ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_THUMBPRINT) >$(BUILD_THUMBPRINT_FILE) && grep " " $(BUILD_THUMBPRINT_FILE)))

ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_THUMBPRINT) >$(BUILD_THUMBPRINT_FILE).tmp && (if ! cmp -s $(BUILD_THUMBPRINT_FILE).tmp $(BUILD_THUMBPRINT_FILE); then mv $(BUILD_THUMBPRINT_FILE).tmp $(BUILD_THUMBPRINT_FILE); else rm $(BUILD_THUMBPRINT_FILE).tmp; fi) && grep " " $(BUILD_THUMBPRINT_FILE)))

  $(error BUILD_THUMBPRINT cannot contain spaces: "$(file <$(BUILD_THUMBPRINT_FILE))")

endif

# unset it for safety.

core/dex_preopt_odex_install.mk

+18 −6
Original line number Diff line number Diff line
@@ -138,9 +138,17 @@ else 
  my_dexpreopt_libs_compat :=

endif



my_dexpreopt_libs := \

  $(LOCAL_USES_LIBRARIES) \

  $(my_filtered_optional_uses_libraries)

# Bootclasspath jars are accessible by all apps, so they don't have to and

# should not be in the CLC.

# For framework.jar, the name in `PRODUCT_BOOT_JARS` is `framework-minus-apex`,

# so we need to use `FRAMEWORK_LIBRARIES`, which contains `framework`, to be

# used for filtering.

my_all_boot_jars := \

  $(foreach jar,$(PRODUCT_BOOT_JARS) $(PRODUCT_APEX_BOOT_JARS),$(call word-colon,2,$(jar))) \

  $(FRAMEWORK_LIBRARIES)



my_dexpreopt_libs := $(filter-out $(my_all_boot_jars), \

  $(LOCAL_USES_LIBRARIES) $(my_filtered_optional_uses_libraries))



# The order needs to be deterministic.

my_dexpreopt_libs_all := $(sort $(my_dexpreopt_libs) $(my_dexpreopt_libs_compat))
@@ -152,7 +160,7 @@ my_dexpreopt_libs_all := $(sort $(my_dexpreopt_libs) $(my_dexpreopt_libs_compat) 
# this dexpreopt.config is generated. So it's necessary to add file-level

# dependencies between dexpreopt.config files.

my_dexpreopt_dep_configs := $(foreach lib, \

  $(filter-out $(my_dexpreopt_libs_compat) $(FRAMEWORK_LIBRARIES),$(LOCAL_USES_LIBRARIES) $(my_filtered_optional_uses_libraries)), \

  $(filter-out $(my_dexpreopt_libs_compat),$(my_dexpreopt_libs)), \

  $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,)/dexpreopt.config)



# 1: SDK version
@@ -234,18 +242,21 @@ endif 
my_enforced_uses_libraries :=

ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES))

  my_verify_script := build/soong/scripts/manifest_check.py

  my_uses_libs_args := $(patsubst %,--uses-library %,$(LOCAL_USES_LIBRARIES))

  my_uses_libs_args := $(patsubst %,--uses-library %, \

    $(filter-out $(my_all_boot_jars),$(LOCAL_USES_LIBRARIES)))

  my_optional_uses_libs_args := $(patsubst %,--optional-uses-library %, \

    $(LOCAL_OPTIONAL_USES_LIBRARIES))

    $(filter-out $(my_all_boot_jars),$(LOCAL_OPTIONAL_USES_LIBRARIES)))

  my_relax_check_arg := $(if $(filter true,$(RELAX_USES_LIBRARY_CHECK)), \

    --enforce-uses-libraries-relax,)

  my_dexpreopt_config_args := $(patsubst %,--dexpreopt-config %,$(my_dexpreopt_dep_configs))

  my_bootclasspath_libs_args := $(patsubst %,--bootclasspath-libs %,$(my_all_boot_jars))



  my_enforced_uses_libraries := $(intermediates)/enforce_uses_libraries.status

  $(my_enforced_uses_libraries): PRIVATE_USES_LIBRARIES := $(my_uses_libs_args)

  $(my_enforced_uses_libraries): PRIVATE_OPTIONAL_USES_LIBRARIES := $(my_optional_uses_libs_args)

  $(my_enforced_uses_libraries): PRIVATE_DEXPREOPT_CONFIGS := $(my_dexpreopt_config_args)

  $(my_enforced_uses_libraries): PRIVATE_RELAX_CHECK := $(my_relax_check_arg)

  $(my_enforced_uses_libraries): PRIVATE_BOOT_CLASSPATH_LIBS := $(my_bootclasspath_libs_args)

  $(my_enforced_uses_libraries): $(AAPT2)

  $(my_enforced_uses_libraries): $(my_verify_script)

  $(my_enforced_uses_libraries): $(my_dexpreopt_dep_configs)
@@ -260,6 +271,7 @@ ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES)) 
	  $(PRIVATE_OPTIONAL_USES_LIBRARIES) \

	  $(PRIVATE_DEXPREOPT_CONFIGS) \

	  $(PRIVATE_RELAX_CHECK) \

	  $(PRIVATE_BOOT_CLASSPATH_LIBS) \

	  $<

  $(LOCAL_BUILT_MODULE) : $(my_enforced_uses_libraries)

endif

target/product/OWNERS

+2 −1
Original line number Diff line number Diff line 
per-file runtime_libart.mk = mast@google.com, ngeoffray@google.com, rpl@google.com, vmarko@google.com

per-file runtime_libart.mk = file:platform/art:main:/OWNERS

per-file default_art_config.mk = file:platform/art:main:/OWNERS



# GSI

per-file gsi_release.mk = file:/target/product/gsi/OWNERS