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

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

Make change and version bump to BP2A.250206.001 

Snap for 13017112 from 2d417486 to 25Q2-release

Change-Id: I7dee22ce3ea39960dbdfef8879849308f0a72cad
parents 48a7359c 2d417486

core/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -1982,7 +1982,7 @@ target_system_dlkm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYST 
installed_system_dlkm_notice_xml_gz := $(TARGET_OUT_SYSTEM_DLKM)/etc/NOTICE.xml.gz



ALL_INSTALLED_NOTICE_FILES := \

  $(if $(USE_SOONG_DEFINED_SYSTEM_IMAGE),,$(installed_notice_html_or_xml_gz)) \

  $(installed_notice_html_or_xml_gz) \

  $(installed_vendor_notice_xml_gz) \

  $(installed_product_notice_xml_gz) \

  $(installed_system_ext_notice_xml_gz) \
@@ -1993,7 +1993,8 @@ ALL_INSTALLED_NOTICE_FILES := \ 


# $1 installed file path, e.g. out/target/product/vsoc_x86_64/system_ext/etc/NOTICE.xml.gz

define is-notice-file

$(if $(findstring $1,$(ALL_INSTALLED_NOTICE_FILES)),Y)

$(if $(filter true,$(PRODUCT_USE_SOONG_NOTICE_XML)),, \

  $(if $(findstring $1,$(ALL_INSTALLED_NOTICE_FILES)),Y))

endef



# Notice files are copied to TARGET_OUT_NOTICE_FILES as a side-effect of their module
@@ -2069,9 +2070,7 @@ endif 


endif # PRODUCT_NOTICE_SPLIT



ifneq ($(USE_SOONG_DEFINED_SYSTEM_IMAGE),true)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)

endif



need_vendor_notice:=false

ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),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.250205.001
 
BUILD_ID=BP2A.250206.001

core/os_licensing.mk

+30 −2
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ $(eval $(call xml-notice-rule,$(target_notice_file_xml_gz),"System image",$(syst 


$(eval $(call text-notice-rule,$(target_notice_file_txt),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))



ifneq ($(USE_SOONG_DEFINED_SYSTEM_IMAGE),true)

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(installed_notice_html_or_xml_gz): $(target_notice_file_xml_gz)

	$(copy-file-to-target)

endif

endif



$(call declare-1p-target,$(target_notice_file_xml_gz))

ifneq ($(USE_SOONG_DEFINED_SYSTEM_IMAGE),true)

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(call declare-1p-target,$(installed_notice_html_or_xml_gz))

endif

endif
@@ -44,12 +44,16 @@ $(eval $(call xml-notice-rule,$(target_vendor_notice_file_xml_gz),"Vendor image" 
         "Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \

         $(VENDOR_NOTICE_DEPS),$(VENDOR_NOTICE_DEPS)))



ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz)

	$(copy-file-to-target)

endif



$(call declare-1p-target,$(target_vendor_notice_file_xml_gz))

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(call declare-1p-target,$(installed_vendor_notice_xml_gz))

endif

endif



.PHONY: odmlicense

odmlicense: $(call corresponding-license-metadata, $(ODM_NOTICE_DEPS)) reportmissinglicenses
@@ -63,12 +67,16 @@ $(eval $(call xml-notice-rule,$(target_odm_notice_file_xml_gz),"ODM filesystem i 
         "Notices for files contained in the odm filesystem image in this directory:", \

         $(ODM_NOTICE_DEPS),$(ODM_NOTICE_DEPS)))



ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz)

	$(copy-file-to-target)

endif



$(call declare-1p-target,$(target_odm_notice_file_xml_gz))

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(call declare-1p-target,$(installed_odm_notice_xml_gz))

endif

endif



.PHONY: oemlicense

oemlicense: $(call corresponding-license-metadata, $(OEM_NOTICE_DEPS)) reportmissinglicenses
@@ -85,12 +93,16 @@ $(eval $(call xml-notice-rule,$(target_product_notice_file_xml_gz),"Product imag 
         "Notices for files contained in the product filesystem image in this directory:", \

         $(PRODUCT_NOTICE_DEPS),$(PRODUCT_NOTICE_DEPS)))



ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(installed_product_notice_xml_gz): $(target_product_notice_file_xml_gz)

	$(copy-file-to-target)

endif



$(call declare-1p-target,$(target_product_notice_file_xml_gz))

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(call declare-1p-target,$(installed_product_notice_xml_gz))

endif

endif



.PHONY: systemextlicense

systemextlicense: $(call corresponding-license-metadata, $(SYSTEM_EXT_NOTICE_DEPS)) reportmissinglicenses
@@ -104,12 +116,16 @@ $(eval $(call xml-notice-rule,$(target_system_ext_notice_file_xml_gz),"System_ex 
         "Notices for files contained in the system_ext filesystem image in this directory:", \

         $(SYSTEM_EXT_NOTICE_DEPS),$(SYSTEM_EXT_NOTICE_DEPS)))



ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(installed_system_ext_notice_xml_gz): $(target_system_ext_notice_file_xml_gz)

	$(copy-file-to-target)

endif



$(call declare-1p-target,$(target_system_ext_notice_file_xml_gz))

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(call declare-1p-target,$(installed_system_ext_notice_xml_gz))

endif

endif



.PHONY: vendor_dlkmlicense

vendor_dlkmlicense: $(call corresponding-license-metadata, $(VENDOR_DLKM_NOTICE_DEPS)) reportmissinglicenses
@@ -123,12 +139,16 @@ $(eval $(call xml-notice-rule,$(target_vendor_dlkm_notice_file_xml_gz),"Vendor_d 
         "Notices for files contained in the vendor_dlkm filesystem image in this directory:", \

         $(VENDOR_DLKM_NOTICE_DEPS),$(VENDOR_DLKM_NOTICE_DEPS)))



ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz)

	$(copy-file-to-target)

endif



$(call declare-1p-target,$(target_vendor_dlkm_notice_file_xml_gz))

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(call declare-1p-target,$(installed_vendor_dlkm_notice_xml_gz))

endif

endif



.PHONY: odm_dlkmlicense

odm_dlkmlicense: $(call corresponding-license-metadata, $(ODM_DLKM_NOTICE_DEPS)) reportmissinglicenses
@@ -142,12 +162,16 @@ $(eval $(call xml-notice-rule,$(target_odm_dlkm_notice_file_xml_gz),"ODM_dlkm fi 
         "Notices for files contained in the odm_dlkm filesystem image in this directory:", \

         $(ODM_DLKM_NOTICE_DEPS),$(ODM_DLKM_NOTICE_DEPS)))



ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(installed_odm_dlkm_notice_xml_gz): $(target_odm_dlkm_notice_file_xml_gz)

	$(copy-file-to-target)

endif



$(call declare-1p-target,$(target_odm_dlkm_notice_file_xml_gz))

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(call declare-1p-target,$(installed_odm_dlkm_notice_xml_gz))

endif

endif



.PHONY: system_dlkmlicense

system_dlkmlicense: $(call corresponding-license-metadata, $(SYSTEM_DLKM_NOTICE_DEPS)) reportmissinglicenses
@@ -161,11 +185,15 @@ $(eval $(call xml-notice-rule,$(target_system_dlkm_notice_file_xml_gz),"System_d 
         "Notices for files contained in the system_dlkm filesystem image in this directory:", \

         $(SYSTEM_DLKM_NOTICE_DEPS),$(SYSTEM_DLKM_NOTICE_DEPS)))



ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(installed_system_dlkm_notice_xml_gz): $(target_system_dlkm_notice_file_xml_gz)

	$(copy-file-to-target)

endif



$(call declare-1p-target,$(target_system_dlkm_notice_file_xml_gz))

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)

$(call declare-1p-target,$(installed_sysetm_dlkm_notice_xml_gz))

endif

endif



endif # not TARGET_BUILD_APPS

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

+0 −3
Original line number Diff line number Diff line
@@ -243,9 +243,6 @@ fn add_feature_flags_impl_template( 
        return Ok(());

    }



    println!("lib exported: {}", context.library_exported);

    println!("new_exp: {}", context.new_exported);

    println!("allow in: {}", context.allow_instrumentation);

    match (context.library_exported, context.new_exported, context.allow_instrumentation) {

        // Exported library with new_exported enabled, use new storage exported template.

        (true, true, _) => {

tools/filelistdiff/allowlist

+0 −2
Original line number Diff line number Diff line 
# Known diffs that are installed in either system image with the configuration

# b/353429422

init.environ.rc
 
# b/338342381

etc/NOTICE.xml.gz