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

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

Make change and version bump to BP2A.250220.001 

Snap for 13088830 from 16484c4f to 25Q2-release

Change-Id: Id6e2e9d8148211166b7527ea27e9f2032bdc86c2
parents 162f79e0 16484c4f

core/Makefile

+49 −49
Original line number Diff line number Diff line
@@ -1223,55 +1223,6 @@ endif 
endif # BOARD_PREBUILT_DTBOIMAGE_16KB





ifneq ($(BOARD_KERNEL_PATH_16K),)

BUILT_KERNEL_16K_TARGET := $(PRODUCT_OUT)/kernel_16k



$(eval $(call copy-one-file,$(BOARD_KERNEL_PATH_16K),$(BUILT_KERNEL_16K_TARGET)))



# Copies BOARD_KERNEL_PATH_16K to output directory as is

kernel_16k: $(BUILT_KERNEL_16K_TARGET)

.PHONY: kernel_16k



BUILT_BOOTIMAGE_16K_TARGET := $(PRODUCT_OUT)/boot_16k.img



BOARD_KERNEL_16K_BOOTIMAGE_PARTITION_SIZE := $(BOARD_BOOTIMAGE_PARTITION_SIZE)



$(BUILT_BOOTIMAGE_16K_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILES) $(BOARD_AVB_BOOT_KEY_PATH) $(BUILT_KERNEL_16K_TARGET)

	$(call pretty,"Target boot 16k image: $@")

	$(call build_boot_from_kernel_avb_enabled,$@,$(BUILT_KERNEL_16K_TARGET))





bootimage_16k: $(BUILT_BOOTIMAGE_16K_TARGET)

.PHONY: bootimage_16k



BUILT_BOOT_OTA_PACKAGE_16K := $(PRODUCT_OUT)/boot_ota_16k.zip

$(BUILT_BOOT_OTA_PACKAGE_16K):  $(OTA_FROM_RAW_IMG) \

                                $(BUILT_BOOTIMAGE_16K_TARGET) \

                                $(INSTALLED_BOOTIMAGE_TARGET) \

                                $(DEFAULT_SYSTEM_DEV_CERTIFICATE).pk8 \

                                $(INSTALLED_DTBOIMAGE_16KB_TARGET) \

                                $(INSTALLED_DTBOIMAGE_TARGET)

	$(OTA_FROM_RAW_IMG) --package_key $(DEFAULT_SYSTEM_DEV_CERTIFICATE) \

                      --max_timestamp `cat $(BUILD_DATETIME_FILE)` \

                      --path $(HOST_OUT) \

                      --partition_name $(if $(and $(INSTALLED_DTBOIMAGE_TARGET),\

                          $(INSTALLED_DTBOIMAGE_16KB_TARGET)),\

                        boot$(comma)dtbo,\

                        boot) \

                      --output $@ \

                      $(if $(BOARD_16K_OTA_USE_INCREMENTAL),\

                        $(INSTALLED_BOOTIMAGE_TARGET):$(BUILT_BOOTIMAGE_16K_TARGET),\

                        $(BUILT_BOOTIMAGE_16K_TARGET)\

                      )\

                      $(if $(and $(INSTALLED_DTBOIMAGE_TARGET),$(INSTALLED_DTBOIMAGE_16KB_TARGET)),\

                        $(INSTALLED_DTBOIMAGE_16KB_TARGET))



boototapackage_16k: $(BUILT_BOOT_OTA_PACKAGE_16K)

.PHONY: boototapackage_16k



endif





ramdisk_intermediates :=$= $(call intermediates-dir-for,PACKAGING,ramdisk)

$(eval $(call write-partition-file-list,$(ramdisk_intermediates)/file_list.txt,$(TARGET_RAMDISK_OUT),$(INTERNAL_RAMDISK_FILES)))
@@ -1508,6 +1459,55 @@ endif # BOARD_PREBUILT_BOOTIMAGE 
endif # my_installed_prebuilt_gki_apex not defined



ifneq ($(BOARD_KERNEL_PATH_16K),)



BUILT_KERNEL_16K_TARGET := $(PRODUCT_OUT)/kernel_16k



$(eval $(call copy-one-file,$(BOARD_KERNEL_PATH_16K),$(BUILT_KERNEL_16K_TARGET)))



# Copies BOARD_KERNEL_PATH_16K to output directory as is

kernel_16k: $(BUILT_KERNEL_16K_TARGET)

.PHONY: kernel_16k



BUILT_BOOTIMAGE_16K_TARGET := $(PRODUCT_OUT)/boot_16k.img



BOARD_KERNEL_16K_BOOTIMAGE_PARTITION_SIZE := $(BOARD_BOOTIMAGE_PARTITION_SIZE)



$(BUILT_BOOTIMAGE_16K_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILES) $(BOARD_AVB_BOOT_KEY_PATH) $(BUILT_KERNEL_16K_TARGET)

	$(call pretty,"Target boot 16k image: $@")

	$(call build_boot_from_kernel_avb_enabled,$@,$(BUILT_KERNEL_16K_TARGET))





bootimage_16k: $(BUILT_BOOTIMAGE_16K_TARGET)

.PHONY: bootimage_16k



BUILT_BOOT_OTA_PACKAGE_16K := $(PRODUCT_OUT)/boot_ota_16k.zip

$(BUILT_BOOT_OTA_PACKAGE_16K): PRIVATE_BOOTIMAGE_TARGET := $(INSTALLED_BOOTIMAGE_TARGET)

$(BUILT_BOOT_OTA_PACKAGE_16K): PRIVATE_BOOTIMAGE_16KB_TARGET := $(BUILT_BOOTIMAGE_16K_TARGET)

$(BUILT_BOOT_OTA_PACKAGE_16K):  $(OTA_FROM_RAW_IMG) \

                                $(DEFAULT_SYSTEM_DEV_CERTIFICATE).pk8 \

                                $(INSTALLED_BOOTIMAGE_TARGET) \

                                $(BUILT_BOOTIMAGE_16K_TARGET) \

                                $(INSTALLED_DTBOIMAGE_16KB_TARGET) \

                                $(INSTALLED_DTBOIMAGE_TARGET)

	$(OTA_FROM_RAW_IMG) --package_key $(DEFAULT_SYSTEM_DEV_CERTIFICATE) \

                      --max_timestamp `cat $(BUILD_DATETIME_FILE)` \

                      --path $(HOST_OUT) \

                      --partition_name $(if $(and $(INSTALLED_DTBOIMAGE_TARGET),\

                          $(INSTALLED_DTBOIMAGE_16KB_TARGET)),\

                        boot$(comma)dtbo,\

                        boot) \

                      --output $@ \

                      $(if $(BOARD_16K_OTA_USE_INCREMENTAL),\

                        $(PRIVATE_BOOTIMAGE_TARGET):$(PRIVATE_BOOTIMAGE_16KB_TARGET),\

                        $(PRIVATE_BOOTIMAGE_16KB_TARGET)\

                      )\

                      $(if $(and $(INSTALLED_DTBOIMAGE_TARGET),$(INSTALLED_DTBOIMAGE_16KB_TARGET)),\

                        $(INSTALLED_DTBOIMAGE_16KB_TARGET))



boototapackage_16k: $(BUILT_BOOT_OTA_PACKAGE_16K)

.PHONY: boototapackage_16k





BUILT_BOOT_OTA_PACKAGE_4K := $(PRODUCT_OUT)/boot_ota_4k.zip

$(BUILT_BOOT_OTA_PACKAGE_4K): $(OTA_FROM_RAW_IMG) \

                              $(INSTALLED_BOOTIMAGE_TARGET) \

core/base_rules.mk

+0 −7
Original line number Diff line number Diff line
@@ -861,13 +861,6 @@ else 
      $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

        $(LOCAL_PATH)/DynamicConfig.xml:$(dir)/$(LOCAL_MODULE).dynamic)))

  endif



  ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config))

  $(foreach extra_config, $(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config), \

    $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

      $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

        $(extra_config):$(dir)/$(notdir $(extra_config))))))

  endif

endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files

core/board_config_wpa_supplicant.mk

+8 −0
Original line number Diff line number Diff line
@@ -40,11 +40,19 @@ ifeq ($(WIFI_FEATURE_HOSTAPD_11AX),true) 
$(call soong_config_set_bool,wpa_supplicant_8,hostapd_11ax,true)

endif



ifeq ($(WIFI_FEATURE_SUPPLICANT_11AX),true)

$(call soong_config_set_bool,wpa_supplicant_8,wpa_supplicant_11ax,true)

endif



# Belong to CONFIG_IEEE80211BE definition

ifeq ($(WIFI_FEATURE_HOSTAPD_11BE),true)

$(call soong_config_set_bool,wpa_supplicant_8,hostapd_11be,true)

endif



ifeq ($(WIFI_FEATURE_SUPPLICANT_11BE),true)

$(call soong_config_set_bool,wpa_supplicant_8,wpa_supplicant_11be,true)

endif



# PLATFORM_VERSION

$(call soong_config_set,wpa_supplicant_8,platform_version,$(PLATFORM_VERSION))

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.250219.002
 
BUILD_ID=BP2A.250220.001

envsetup.sh

+2 −64
Original line number Diff line number Diff line
@@ -438,68 +438,6 @@ function print_lunch_menu() 
    echo

}



function lunch()

{

    local answer

    setup_cog_env_if_needed



    if [[ $# -gt 1 ]]; then

        echo "usage: lunch [target]" >&2

        return 1

    fi



    local used_lunch_menu=0



    if [ "$1" ]; then

        answer=$1

    else

        print_lunch_menu

        echo "Which would you like? [aosp_cf_x86_64_phone-trunk_staging-eng]"

        echo -n "Pick from common choices above (e.g. 13) or specify your own (e.g. aosp_barbet-trunk_staging-eng): "

        read answer

        used_lunch_menu=1

    fi



    local selection=



    if [ -z "$answer" ]

    then

        selection=aosp_cf_x86_64_phone-trunk_staging-eng

    elif (echo -n $answer | grep -q -e "^[0-9][0-9]*$")

    then

        local choices=($(TARGET_BUILD_APPS= TARGET_PRODUCT= TARGET_RELEASE= TARGET_BUILD_VARIANT= _get_build_var_cached COMMON_LUNCH_CHOICES 2>/dev/null))

        if [ $answer -le ${#choices[@]} ]

        then

            # array in zsh starts from 1 instead of 0.

            if [ -n "$ZSH_VERSION" ]

            then

                selection=${choices[$(($answer))]}

            else

                selection=${choices[$(($answer-1))]}

            fi

        fi

    else

        selection=$answer

    fi



    export TARGET_BUILD_APPS=



    # This must be <product>-<release>-<variant>

    local product release variant

    # Split string on the '-' character.

    IFS="-" read -r product release variant <<< "$selection"



    if [[ -z "$product" ]] || [[ -z "$release" ]] || [[ -z "$variant" ]]

    then

        echo

        echo "Invalid lunch combo: $selection"

        echo "Valid combos must be of the form <product>-<release>-<variant>"

        return 1

    fi



    _lunch_meat $product $release $variant

}



function _lunch_meat()

{

    local product=$1
@@ -582,13 +520,13 @@ function _lunch_usage() 
        echo "Note that the previous interactive menu and list of hard-coded"

        echo "list of curated targets has been removed. If you would like the"

        echo "list of products, release configs for a particular product, or"

        echo "variants, run list_products, list_release_configs, list_variants"

        echo "variants, run list_products list_releases or list_variants"

        echo "respectively."

        echo

    ) 1>&2

}



function lunch2()

function lunch()

{

    if [[ $# -eq 1 && $1 = "--help" ]]; then

        _lunch_usage