tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

releasetools: do not remove dynamic partitions in system-only builds

Browse source 
* Before this commit, the generated `dynamic_partitions_op_list` in
  FullOTA packages always tries to remove all partitions and recreate
  them upon flashing. This makes it impossible to have a system-only
  "FullOTA" because vendor partition(s) are always removed.

* This commit detects if a build is vendor-less and disables every
  dynamic partition operation except `resize`, in order to keep the
  original content around after the flash. The change should not affect
  non-dynamic-partition or builds with vendor image included.

Change-Id: I0cded7f3b2958f35103d73d19b7fb5f292f6c17f
Signed-off-by: Jesse Chan <jc@lineageos.org>
This commit is contained in:
Peter Cai 2020-03-01 14:43:57 +08:00 committed by Bartłomiej Rudecki
parent e7ee416ff9
commit 44112727ed
Signed by: przekichane
GPG key ID: 751F23C6F014EF76
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/releasetools/common.py
View file

@ -3920,10 +3920,11 @@ class DynamicGroupUpdate(object):
class DynamicPartitionsDifference(object): class DynamicPartitionsDifference(object):
def __init__(self, info_dict, block_diffs, progress_dict=None, def __init__(self, info_dict, block_diffs, progress_dict=None,
source_info_dict=None): source_info_dict=None, build_without_vendor=False):
if progress_dict is None: if progress_dict is None:
progress_dict = {} progress_dict = {}
self._build_without_vendor = build_without_vendor
self._remove_all_before_apply = False self._remove_all_before_apply = False
if source_info_dict is None: if source_info_dict is None:
self._remove_all_before_apply = True self._remove_all_before_apply = True
@ -4048,6 +4049,17 @@ class DynamicPartitionsDifference(object):
def comment(line): def comment(line):
self._op_list.append("# %s" % line) self._op_list.append("# %s" % line)
if self._build_without_vendor:
comment('System-only build, keep original vendor partition')
# When building without vendor, we do not want to override
# any partition already existing. In this case, we can only
# resize, but not remove / create / re-create any other
# partition.
for p, u in self._partition_updates.items():
comment('Resize partition %s to %s' % (p, u.tgt_size))
append('resize %s %s' % (p, u.tgt_size))
return
if self._remove_all_before_apply: if self._remove_all_before_apply:
comment('Remove all existing dynamic partitions and groups before ' comment('Remove all existing dynamic partitions and groups before '
'applying full OTA') 'applying full OTA')

3
tools/releasetools/non_ab_ota.py
View file

@ -220,7 +220,8 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
dynamic_partitions_diff = common.DynamicPartitionsDifference( dynamic_partitions_diff = common.DynamicPartitionsDifference(
info_dict=OPTIONS.info_dict, info_dict=OPTIONS.info_dict,
block_diffs=block_diff_dict.values(), block_diffs=block_diff_dict.values(),
progress_dict=progress_dict) progress_dict=progress_dict,
build_without_vendor=(not HasPartition(input_zip, "vendor")))
dynamic_partitions_diff.WriteScript(script, output_zip, dynamic_partitions_diff.WriteScript(script, output_zip,
write_verify_script=OPTIONS.verify) write_verify_script=OPTIONS.verify)
else: else: