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

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

Make change and version bump to BP1A.241206.001 

Snap for 12755599 from a085f55a to 25Q1-release

Change-Id: I91e4e219d33af6797060b1d23fb87143ee0cdffe
parents 8ff1f957 a085f55a

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5686,6 +5686,7 @@ INTERNAL_OTATOOLS_MODULES := \ 
  brotli \

  bsdiff \

  build_image \

  build_mixed_kernels_ramdisk_host \

  build_super_image \

  build_verity_metadata \

  build_verity_tree \

core/android_soong_config_vars.mk

+13 −0
Original line number Diff line number Diff line
@@ -204,6 +204,19 @@ endif 
# Required as platform_bootclasspath is using this namespace

$(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))





# Add ondeviceintelligence module build flag to soong

ifeq (true,$(RELEASE_ONDEVICE_INTELLIGENCE_MODULE))

    $(call soong_config_set,ANDROID,release_ondevice_intelligence_module,true)

    # Required as platform_bootclasspath is using this namespace

    $(call soong_config_set,bootclasspath,release_ondevice_intelligence_module,true)



else

    $(call soong_config_set,ANDROID,release_ondevice_intelligence_platform,true)

    $(call soong_config_set,bootclasspath,release_ondevice_intelligence_platform,true)



endif



# Add uprobestats build flag to soong

$(call soong_config_set,ANDROID,release_uprobestats_module,$(RELEASE_UPROBESTATS_MODULE))

# Add uprobestats file move flags to soong, for both platform and module

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=BP1A.241205.002
 
BUILD_ID=BP1A.241206.001

core/soong_config.mk

+20 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
    $(call add_json_str, BoardAvbAlgorithm, $(BOARD_AVB_$(image_type)_ALGORITHM)) \

    $(call add_json_str, BoardAvbRollbackIndex, $(BOARD_AVB_$(image_type)_ROLLBACK_INDEX)) \

    $(call add_json_str, BoardAvbRollbackIndexLocation, $(BOARD_AVB_$(image_type)_ROLLBACK_INDEX_LOCATION)) \

    $(call add_json_str, BoardAvbAddHashtreeFooterArgs, $(BOARD_AVB_$(image_type)_ADD_HASHTREE_FOOTER_ARGS)) \

    $(call add_json_str, ProductBaseFsPath, $(PRODUCT_$(image_type)_BASE_FS_PATH)) \

    $(call add_json_str, ProductHeadroom, $(PRODUCT_$(image_type)_HEADROOM)) \

    $(call add_json_str, ProductVerityPartition, $(PRODUCT_$(image_type)_VERITY_PARTITION)) \
@@ -451,6 +452,25 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  $(call add_json_list, InternalBootconfig, $(INTERNAL_BOOTCONFIG))

  $(call add_json_str, InternalBootconfigFile, $(INTERNAL_BOOTCONFIG_FILE))



  # super image stuff

  $(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_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))

  $(call add_json_map, BoardSuperPartitionGroups)

    $(foreach group, $(BOARD_SUPER_PARTITION_GROUPS), \

      $(call add_json_map, $(group)) \

        $(call add_json_str, GroupSize, $(BOARD_$(call to-upper,$(group))_SIZE)) \

        $(if $(BOARD_$(call to-upper,$(group))_PARTITION_LIST), \

          $(call add_json_list, PartitionList, $(BOARD_$(call to-upper,$(group))_PARTITION_LIST))) \

      $(call end_json_map))

    $(call end_json_map)

  $(call add_json_bool, ProductVirtualAbOta, $(filter true,$(PRODUCT_VIRTUAL_AB_OTA)))

  $(call add_json_bool, ProductVirtualAbOtaRetrofit, $(filter true,$(PRODUCT_VIRTUAL_AB_OTA_RETROFIT)))

  $(call add_json_bool, AbOtaUpdater, $(filter true,$(AB_OTA_UPDATER)))



  # Avb (android verified boot) stuff

  $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))

  $(call add_json_str, BoardAvbAlgorithm, $(BOARD_AVB_ALGORITHM))

core/sysprop.mk

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ ifeq (,$(strip $(BUILD_FINGERPRINT))) 
endif



BUILD_FINGERPRINT_FILE := $(PRODUCT_OUT)/build_fingerprint.txt

ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_FINGERPRINT) >$(BUILD_FINGERPRINT_FILE) && grep " " $(BUILD_FINGERPRINT_FILE)))

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

  $(error BUILD_FINGERPRINT cannot contain spaces: "$(file <$(BUILD_FINGERPRINT_FILE))")

endif

BUILD_FINGERPRINT_FROM_FILE := $$(cat $(BUILD_FINGERPRINT_FILE))