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

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

Make change and version bump to AP3A.240417.001 

Snap for 11722130 from 1537037f to 24Q3-release

Change-Id: I3fb29242c038b0ec50c4985ab782e1aef653a68d
parents 557ddde4 1537037f

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=AP3A.240416.001
 
BUILD_ID=AP3A.240417.001

core/soong_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ $(call add_json_str, Platform_version_known_codenames, $(PLATFORM_VERSION_KNOW 


$(call add_json_bool, Release_aidl_use_unfrozen,         $(RELEASE_AIDL_USE_UNFROZEN))



$(call add_json_str,  Platform_min_supported_target_sdk_version, $(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION))



$(call add_json_bool, Allow_missing_dependencies,        $(filter true,$(ALLOW_MISSING_DEPENDENCIES)))

$(call add_json_bool, Unbundled_build,                   $(TARGET_BUILD_UNBUNDLED))

$(call add_json_list, Unbundled_build_apps,              $(TARGET_BUILD_APPS))

core/version_util.mk

+3 −5
Original line number Diff line number Diff line
@@ -221,10 +221,8 @@ ifndef HAS_BUILD_NUMBER 
endif

.KATI_READONLY := HAS_BUILD_NUMBER



ifndef PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION

  # Used to set minimum supported target sdk version. Apps targeting sdk

  # version lower than the set value will result in a warning being shown

  # when any activity from the app is started.

  PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28

ifdef PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION

  $(error Do not set PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION directly. Use RELEASE_PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION. value: $(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION))

endif

PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := $(RELEASE_PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION)

.KATI_READONLY := PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION

target/product/gsi_release.mk

+0 −3
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true 
# Enable dynamic partition size

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



# Disable the build-time debugfs restrictions on GSI builds

PRODUCT_SET_DEBUGFS_RESTRICTIONS := false



# GSI specific tasks on boot

PRODUCT_PACKAGES += \

    gsi_skip_mount.cfg \

tools/releasetools/add_img_to_target_files.py

+0 −14
Original line number Diff line number Diff line
@@ -1055,20 +1055,6 @@ def AddImagesToTargetFiles(filename): 
    for call in add_partition_calls:

      add_partition(*call)

  else:

    # When calling avbtool make_vbmeta_image, it uses the `partitions`

    # dictionary to include the options for --include_descriptors_from_image.

    # The vbmeta image is different if the order of the

    # --include_descriptors_from_image changes. As the images are generated

    # parallelly and entries are added on completion of image creation,

    # this `partitions` dict might be indeterministic as the order of

    # completion of image creation cannot be predicted.

    # To address this issue, add keys to the dict `partitions` with null values

    # in the order they are listed in the variable `add_partition_calls`, and

    # then the values are updated by `add_partition` keeping the order of the

    # items. This ensures generated vbmeta.img is the same for the same input.

    for call in add_partition_calls:

      if call[1]:

        partitions[call[0]] = None

    with ThreadPoolExecutor(max_workers=len(add_partition_calls)) as executor:

      for future in [executor.submit(add_partition, *call) for call in add_partition_calls]:

        future.result()