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

Commit 18785666 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Update the references to verity tools." am: 31c2bf90 am: ee153db4 

am: 721a294a

Change-Id: I3da610234997a51dd533713bddcdbce6966f139f
parents 56ab4f60 721a294a

CleanSpec.mk

+5 −0
Original line number Diff line number Diff line
@@ -631,6 +631,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/adb_debug.prop)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjavacrypto.so)



# Clean up old verity tools.

$(call add-clean-step, rm -rf $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar)

$(call add-clean-step, rm -rf $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar)

$(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/build_verity_metadata.py)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3566,8 +3566,8 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
  $(HOST_OUT_EXECUTABLES)/bsdiff \

  $(HOST_OUT_EXECUTABLES)/imgdiff \

  $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \

  $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \

  $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar \

  $(HOST_OUT_JAVA_LIBRARIES)/boot_signer.jar \

  $(HOST_OUT_JAVA_LIBRARIES)/verity_signer.jar \

  $(HOST_OUT_EXECUTABLES)/mke2fs \

  $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs \

  $(HOST_OUT_EXECUTABLES)/e2fsdroid \

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ 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.py

BUILD_VERITY_METADATA := $(HOST_OUT_EXECUTABLES)/build_verity_metadata

BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree

BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer

FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host

tools/releasetools/verity_utils.py

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ def GetVerityTreeSize(image_size): 




def GetVerityMetadataSize(image_size):

  cmd = ["build_verity_metadata.py", "size", str(image_size)]

  cmd = ["build_verity_metadata", "size", str(image_size)]

  output = common.RunAndCheckOutput(cmd, verbose=False)

  return int(output)
@@ -97,7 +97,7 @@ def BuildVerityTree(sparse_image_path, verity_image_path): 
def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt,

                        block_device, signer_path, key, signer_args,

                        verity_disable):

  cmd = ["build_verity_metadata.py", "build", str(image_size),

  cmd = ["build_verity_metadata", "build", str(image_size),

         verity_metadata_path, root_hash, salt, block_device, signer_path, key]

  if signer_args:

    cmd.append("--signer_args=\"%s\"" % (' '.join(signer_args),))