diff options
| -rw-r--r-- | core/soong_config.mk | 2 | ||||
| -rw-r--r-- | core/version_util.mk | 8 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 3 | ||||
| -rw-r--r-- | tools/releasetools/add_img_to_target_files.py | 14 | ||||
| -rw-r--r-- | tools/releasetools/common.py | 4 |
5 files changed, 5 insertions, 26 deletions
diff --git a/core/soong_config.mk b/core/soong_config.mk index 3cffef2538..534270e308 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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)) diff --git a/core/version_util.mk b/core/version_util.mk index 610cdaf107..eb568becc4 100644 --- a/core/version_util.mk +++ b/core/version_util.mk @@ -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 diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 2e373663a4..884b419868 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -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 \ diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index a2c0949d45..b39a82cf45 100644 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -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() diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 1a7a29d867..2367691e43 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1523,7 +1523,7 @@ def GetAvbPartitionsArg(partitions, AVB_ARG_NAME_CHAIN_PARTITION: [] } - for partition, path in partitions.items(): + for partition, path in sorted(partitions.items()): avb_partition_arg = GetAvbPartitionArg(partition, path, info_dict) if not avb_partition_arg: continue @@ -1611,7 +1611,7 @@ def BuildVBMeta(image_path, partitions, name, needed_partitions, "avb_custom_vbmeta_images_partition_list", "").strip().split()] avb_partitions = {} - for partition, path in partitions.items(): + for partition, path in sorted(partitions.items()): if partition not in needed_partitions: continue assert (partition in AVB_PARTITIONS or |