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

Merge "Remove the hard-coded path of build_verity_metadata.py."

Browse Source
This commit is contained in:
Tao Bao
2018-03-22 18:41:06 +00:00
committed by Gerrit Code Review
parent 2ebcf419e4 b4ec6d752a
commit 0793683e86
4 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@@ -1063,7 +1063,7 @@ endif
INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS))) INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)) ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY))
INTERNAL_USERIMAGES_DEPS += $(BUILD_VERITY_TREE) $(APPEND2SIMG) $(VERITY_SIGNER) INTERNAL_USERIMAGES_DEPS += $(BUILD_VERITY_METADATA) $(BUILD_VERITY_TREE) $(APPEND2SIMG) $(VERITY_SIGNER)
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY_FEC)) ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY_FEC))
INTERNAL_USERIMAGES_DEPS += $(FEC) INTERNAL_USERIMAGES_DEPS += $(FEC)
endif endif
@@ -2329,7 +2329,6 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_EXECUTABLES)/sload_f2fs \ $(HOST_OUT_EXECUTABLES)/sload_f2fs \
$(HOST_OUT_EXECUTABLES)/simg2img \ $(HOST_OUT_EXECUTABLES)/simg2img \
$(HOST_OUT_EXECUTABLES)/e2fsck \ $(HOST_OUT_EXECUTABLES)/e2fsck \
$(HOST_OUT_EXECUTABLES)/build_verity_tree \
$(HOST_OUT_EXECUTABLES)/generate_verity_key \ $(HOST_OUT_EXECUTABLES)/generate_verity_key \
$(HOST_OUT_EXECUTABLES)/verity_signer \ $(HOST_OUT_EXECUTABLES)/verity_signer \
$(HOST_OUT_EXECUTABLES)/verity_verifier \ $(HOST_OUT_EXECUTABLES)/verity_verifier \
@@ -2342,7 +2341,9 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_EXECUTABLES)/delta_generator \ $(HOST_OUT_EXECUTABLES)/delta_generator \
$(AVBTOOL) \ $(AVBTOOL) \
$(BLK_ALLOC_TO_BASE_FS) \ $(BLK_ALLOC_TO_BASE_FS) \
$(BROTLI) $(BROTLI) \
$(BUILD_VERITY_METADATA) \
$(BUILD_VERITY_TREE)
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)) ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))
OTATOOLS += \ OTATOOLS += \
@@ -2388,7 +2389,6 @@ BUILT_OTATOOLS_PACKAGE := $(PRODUCT_OUT)/otatools.zip
$(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,otatools)/otatools $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,otatools)/otatools
OTATOOLS_DEPS := \ OTATOOLS_DEPS := \
system/extras/verity/build_verity_metadata.py \
system/extras/ext4_utils/mke2fs.conf \ system/extras/ext4_utils/mke2fs.conf \
external/avb/test/data/testkey_rsa4096.pem \ external/avb/test/data/testkey_rsa4096.pem \
$(sort $(shell find system/update_engine/scripts -name \*.pyc -prune -o -type f -print)) \ $(sort $(shell find system/update_engine/scripts -name \*.pyc -prune -o -type f -print)) \

1
core/config.mk
View File

@@ -677,6 +677,7 @@ MERGETAGS := build/make/tools/merge-event-log-tags.py
BUILD_IMAGE_SRCS := $(wildcard build/make/tools/releasetools/*.py) BUILD_IMAGE_SRCS := $(wildcard build/make/tools/releasetools/*.py)
APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg
VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer
BUILD_VERITY_METADATA := $(HOST_OUT_EXECUTABLES)/build_verity_metadata.py
BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree
BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer
FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host

8
tools/releasetools/build_image.py
View File

@@ -80,8 +80,7 @@ def GetVerityTreeSize(partition_size):
def GetVerityMetadataSize(partition_size): def GetVerityMetadataSize(partition_size):
cmd = ["system/extras/verity/build_verity_metadata.py", "size", cmd = ["build_verity_metadata.py", "size", str(partition_size)]
str(partition_size)]
output, exit_code = RunCommand(cmd, False) output, exit_code = RunCommand(cmd, False)
if exit_code != 0: if exit_code != 0:
return False, 0 return False, 0
@@ -250,9 +249,8 @@ def BuildVerityTree(sparse_image_path, verity_image_path, prop_dict):
def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt, def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt,
block_device, signer_path, key, signer_args, block_device, signer_path, key, signer_args,
verity_disable): verity_disable):
cmd = ["system/extras/verity/build_verity_metadata.py", "build", cmd = ["build_verity_metadata.py", "build", str(image_size),
str(image_size), verity_metadata_path, root_hash, salt, block_device, verity_metadata_path, root_hash, salt, block_device, signer_path, key]
signer_path, key]
if signer_args: if signer_args:
cmd.append("--signer_args=\"%s\"" % (' '.join(signer_args),)) cmd.append("--signer_args=\"%s\"" % (' '.join(signer_args),))
if verity_disable: if verity_disable:

16
tools/releasetools/test_validate_target_files.py
View File

@@ -14,21 +14,7 @@
# limitations under the License. # limitations under the License.
# #
"""Unittests for validate_target_files.py. """Unittests for validate_target_files.py."""
Note: This file calls functions in build_image.py that hard-code the path in
relative to ANDROID_BUILD_TOP (e.g.
system/extras/verity/build_verity_metadata.py). So the test needs to be
triggered under ANDROID_BUILD_TOP or the top-level OTA tools directory (i.e.
the one after unzipping otatools.zip).
(from ANDROID_BUILD_TOP)
$ PYTHONPATH=build/make/tools/releasetools python -m unittest \\
test_validate_target_files
(from OTA tools directory)
$ PYTHONPATH=releasetools python -m unittest test_validate_target_files
"""
from __future__ import print_function from __future__ import print_function