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

Commit 1cf8bf0c authored by Tao Bao's avatar Tao Bao
Browse files

Makefile uses add_img_to_target_files module. 

Also pack additional tools into otatools.zip.

Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
Merged-In: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
parent 39369d08

core/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -3621,6 +3621,7 @@ ifeq ($(build_otatools_package),true) 


INTERNAL_OTATOOLS_MODULES := \

  aapt \

  add_img_to_target_files \

  append2simg \

  avbtool \

  blk_alloc_to_base_fs \
@@ -3633,6 +3634,8 @@ INTERNAL_OTATOOLS_MODULES := \ 
  build_verity_metadata \

  build_verity_tree \

  care_map_generator \

  check_ota_package_signature \

  check_target_files_signatures \

  checkvintf \

  delta_generator \

  e2fsck \
@@ -3642,11 +3645,13 @@ INTERNAL_OTATOOLS_MODULES := \ 
  fs_config \

  generate_verity_key \

  img2simg \

  img_from_target_files \

  imgdiff \

  libconscrypt_openjdk_jni \

  lpmake \

  lpunpack \

  make_f2fs \

  merge_target_files \

  minigzip \

  mk_combined_img \

  mkbootfs \
@@ -3661,11 +3666,14 @@ INTERNAL_OTATOOLS_MODULES := \ 
  sefcontext_compile \

  sgdisk \

  shflags \

  sign_apex \

  sign_target_files_apks \

  signapk \

  simg2img \

  sload_f2fs \

  tune2fs \

  update_host_simulator \

  validate_target_files \

  verity_signer \

  verity_verifier \

  zipalign \
@@ -4017,9 +4025,8 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(SOONG_APEX_KEYS_FILE) \

	    $(SOONG_ZIP) \

	    $(HOST_OUT_EXECUTABLES)/fs_config \

	    $(HOST_OUT_EXECUTABLES)/care_map_generator \

	    $(ADD_IMG_TO_TARGET_FILES) \

	    $(MAKE_RECOVERY_PATCH) \

	    $(BUILD_IMAGE_SRCS) \

	    $(BUILT_ASSEMBLED_FRAMEWORK_MANIFEST) \

	    $(BUILT_ASSEMBLED_VENDOR_MANIFEST) \

	    $(BUILT_SYSTEM_MATRIX) \
@@ -4286,7 +4293,7 @@ ifneq ($(BOARD_SUPER_PARTITION_GROUPS),) 
endif # BOARD_SUPER_PARTITION_GROUPS

	@# TODO(b/134525174): Remove `-r` after addressing the issue with recovery patch generation.

	$(hide) PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	    build/make/tools/releasetools/add_img_to_target_files -a -r -v -p $(HOST_OUT) $(zip_root)

	    $(ADD_IMG_TO_TARGET_FILES) -a -r -v -p $(HOST_OUT) $(zip_root)

ifeq ($(BUILD_QEMU_IMAGES),true)

	$(hide) AVBTOOL=$(AVBTOOL) $(MK_VBMETA_BOOT_KERNEL_CMDLINE_SH) $(zip_root)/IMAGES/vbmeta.img \

	    $(zip_root)/IMAGES/system.img $(zip_root)/IMAGES/VerifiedBootParams.textproto

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar 
FAT16COPY := build/make/tools/fat16copy.py

CHECK_ELF_FILE := build/make/tools/check_elf_file.py

LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX)

ADD_IMG_TO_TARGET_FILES := $(HOST_OUT_EXECUTABLES)/add_img_to_target_files$(HOST_EXECUTABLE_SUFFIX)

BUILD_IMAGE := $(HOST_OUT_EXECUTABLES)/build_image$(HOST_EXECUTABLE_SUFFIX)

BUILD_SUPER_IMAGE := $(HOST_OUT_EXECUTABLES)/build_super_image$(HOST_EXECUTABLE_SUFFIX)

MAKE_RECOVERY_PATCH := $(HOST_OUT_EXECUTABLES)/make_recovery_patch$(HOST_EXECUTABLE_SUFFIX)
@@ -616,7 +617,6 @@ PROGUARD := $(PROGUARD_HOME)/bin/proguard.sh 
PROGUARD_DEPS := $(PROGUARD) $(PROGUARD_HOME)/lib/proguard.jar

JAVATAGS := build/make/tools/java-event-log-tags.py

MERGETAGS := build/make/tools/merge-event-log-tags.py

BUILD_IMAGE_SRCS := $(wildcard build/make/tools/releasetools/*.py)

APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg

VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer

BUILD_VERITY_METADATA := $(HOST_OUT_EXECUTABLES)/build_verity_metadata