diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-08 23:15:04 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-08 23:15:04 +0000 |
| commit | 12e153d5be1e4229d6067d206022d44aa4dda975 (patch) | |
| tree | 33c918297996dcf1e683ef82dc650299756286a5 | |
| parent | 016bfcd5cd5d6cc71d0b8052fdb2397da28fa6ed (diff) | |
| parent | 97a6690a230bfff7501dc032a8853b41a9f534f0 (diff) | |
| download | build-12e153d5be1e4229d6067d206022d44aa4dda975.tar.gz | |
Snap for 5645017 from 97a6690a230bfff7501dc032a8853b41a9f534f0 to qt-aml-release
Change-Id: I43cdbe5ae6bdb49f754c8d483e6517a80df0031b
| -rw-r--r-- | core/Makefile | 3 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rwxr-xr-x | tools/releasetools/add_img_to_target_files.py | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index d9a0fc1084..4611fb388d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4175,8 +4175,9 @@ ifneq ($(BOARD_SUPER_PARTITION_GROUPS),) $(if $(_group_partition_list), \ echo "$(group)_partition_list=$(_group_partition_list)" >> $(zip_root)/META/dynamic_partitions_info.txt;)) endif # BOARD_SUPER_PARTITION_GROUPS + @# TODO(b/134525174): Remove `-r` after addressing the issue with recovery patch generation. $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \ - build/make/tools/releasetools/add_img_to_target_files -a -v -p $(HOST_OUT) $(zip_root) + build/make/tools/releasetools/add_img_to_target_files -a -r -v -p $(HOST_OUT) $(zip_root) @# Zip everything up, preserving symlinks and placing META/ files first to @# help early validation of the .zip file while uploading it. $(hide) find $(zip_root)/META | sort >$@.list diff --git a/core/build_id.mk b/core/build_id.mk index a2e5d8424b..2329288076 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QP1A.190606.002 +BUILD_ID=QT diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index 10aecf9216..1090d57194 100755 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -28,7 +28,8 @@ Usage: add_img_to_target_files [flag] target_files -r (--rebuild_recovery) Rebuild the recovery patch and write it to the system image. Only - meaningful when system image needs to be rebuilt. + meaningful when system image needs to be rebuilt and there're separate + boot / recovery images. --replace_verity_private_key Replace the private key used for verity signing. (same as the option @@ -153,7 +154,8 @@ def AddSystem(output_zip, recovery_img=None, boot_img=None): else: common.ZipWrite(output_zip, ofile.name, arc_name) - if OPTIONS.rebuild_recovery: + if (OPTIONS.rebuild_recovery and recovery_img is not None and + boot_img is not None): logger.info("Building new recovery patch") common.MakeRecoveryPatch(OPTIONS.input_tmp, output_sink, recovery_img, boot_img, info_dict=OPTIONS.info_dict) |