StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "dynamic_partition_use -> use_dynamic_partitions."

Browse Source 
am: 9b024fe583

Change-Id: I51043b6f2098cc0b7983a46ea08395d85197cb8e
This commit is contained in:
Yifan Hong
2018-11-21 16:33:23 -08:00
committed by android-build-merger
parent d885783080 9b024fe583
commit 0d69a1372a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -3672,7 +3672,7 @@ ifdef BUILT_VENDOR_MATRIX
$(hide) cp $(BUILT_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml
endif
ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
$(hide) echo "dynamic_partition_use=true" >> $(zip_root)/META/misc_info.txt
$(hide) echo "use_dynamic_partitions=true" >> $(zip_root)/META/misc_info.txt
endif
ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)
$(hide) echo "dynamic_partition_retrofit=true" >> $(zip_root)/META/misc_info.txt

6
tools/releasetools/ota_from_target_files.py
View File

@@ -2013,10 +2013,10 @@ def main(argv):
OPTIONS.oem_dicts = _LoadOemDicts(OPTIONS.oem_source)
# Assume retrofitting dynamic partitions when base build does not set
# dynamic_partition_use but target build does.
# use_dynamic_partitions but target build does.
if (OPTIONS.source_info_dict and
OPTIONS.source_info_dict.get("dynamic_partition_use") != "true" and
OPTIONS.target_info_dict.get("dynamic_partition_use") == "true"):
OPTIONS.source_info_dict.get("use_dynamic_partitions") != "true" and
OPTIONS.target_info_dict.get("use_dynamic_partitions") == "true"):
if OPTIONS.target_info_dict.get("dynamic_partition_retrofit") != "true":
raise common.ExternalError(
"Expect to generate incremental OTA for retrofitting dynamic "