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

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

Make change and version bump to BP2A.250301.001 

Snap for 13143403 from 319de160 to 25Q2-release

Change-Id: Ia6b0b0323ce5b71dc04fe03081d2158d19d23b1d
parents 028f33e8 319de160

core/Makefile

+4 −12
Original line number Diff line number Diff line
@@ -1926,15 +1926,6 @@ kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt 
# need no associated notice file on the device UI.

exclude_target_dirs := apex



# TODO(b/69865032): Make PRODUCT_NOTICE_SPLIT the default behavior.

ifneq ($(PRODUCT_NOTICE_SPLIT),true)

#target_notice_file_html := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html

target_notice_file_html_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz

installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.html.gz



$(call declare-0p-target,$(target_notice_file_html_gz))

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

else

# target_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml

target_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml.gz

installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.xml.gz
@@ -2054,8 +2045,6 @@ system_xml_directories := xml_system 
system_notice_file_message := "Notices for files contained in the system filesystem image in this directory:"

endif



endif # PRODUCT_NOTICE_SPLIT



ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)



need_vendor_notice:=false
@@ -5885,7 +5874,10 @@ endif 
endif # BOARD_AVB_ENABLE

ifneq (,$(strip $(BOARD_CUSTOMIMAGES_PARTITION_LIST)))

	$(hide) $(foreach partition,$(BOARD_CUSTOMIMAGES_PARTITION_LIST), \

	  echo "flash $(partition)" >> $@;)

		$(if $(BOARD_$(call to-upper,$(partition))_IMAGE_NO_FLASHALL),, \

	      echo "flash $(partition)" >> $@; \

		) \

	)

endif

	$(hide) echo "reboot fastboot" >> $@

	$(hide) echo "update-super" >> $@

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.250228.002
 
BUILD_ID=BP2A.250301.001

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -765,7 +765,6 @@ endif 


# TODO: remove all code referencing these, and remove override variables

PRODUCT_FULL_TREBLE := true

PRODUCT_NOTICE_SPLIT := true

PRODUCT_TREBLE_LINKER_NAMESPACES := true

PRODUCT_ENFORCE_VINTF_MANIFEST := true
@@ -774,7 +773,6 @@ PRODUCT_ENFORCE_VINTF_MANIFEST := true 
    PRODUCT_FULL_TREBLE \

    PRODUCT_TREBLE_LINKER_NAMESPACES \

    PRODUCT_ENFORCE_VINTF_MANIFEST \

    PRODUCT_NOTICE_SPLIT \



# TODO(b/114488870): remove all sets of these everwhere, and disallow them to be used

$(KATI_obsolete_var PRODUCT_TREBLE_LINKER_NAMESPACES_OVERRIDE,Deprecated.)

core/definitions.mk

+0 −12
Original line number Diff line number Diff line
@@ -835,18 +835,6 @@ $(strip \ 
)

endef



###########################################################

## Declare that non-module targets copied from project $(1) and

## optionally ending in $(2) are non-copyrightable files.

##

## e.g. an information-only file merely listing other files.

###########################################################

define declare-0p-copy-files

$(strip \

  $(foreach _pair,$(filter $(1)%$(2),$(PRODUCT_COPY_FILES)),$(eval $(call declare-0p-target,$(PRODUCT_OUT)/$(call word-colon,2,$(_pair))))) \

)

endef



###########################################################

## Declare non-module target $(1) to have a first-party license

## (Android Apache 2.0)

core/os_licensing.mk

+0 −7
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ ifneq (,$(SYSTEM_NOTICE_DEPS)) 


SYSTEM_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS) $(UNMOUNTED_NOTICE_VENDOR_DEPS)



ifneq ($(PRODUCT_NOTICE_SPLIT),true)

$(eval $(call html-notice-rule,$(target_notice_file_html_gz),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))



$(installed_notice_html_or_xml_gz): $(target_notice_file_html_gz)

	$(copy-file-to-target)

else

$(eval $(call xml-notice-rule,$(target_notice_file_xml_gz),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))



$(eval $(call text-notice-rule,$(target_notice_file_txt),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))
@@ -21,7 +15,6 @@ 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 ($(PRODUCT_USE_SOONG_NOTICE_XML),true)