merge in oc-release history after reset to master
diff --git a/core/build_id.mk b/core/build_id.mk
index 1f5f9c9..0e8e2cf 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.
-export BUILD_ID=ORF24
+export BUILD_ID=MASTER
diff --git a/core/pathmap.mk b/core/pathmap.mk
index c328e58..55cf867 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -123,7 +123,6 @@
v7/preference \
v14/preference \
v17/preference-leanback \
- documents-archive \
customtabs
#
diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 54223b6..5e68bbf 100755
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -41,9 +41,6 @@
--is_signing
Skip building & adding the images for "userdata" and "cache" if we
are signing the target files.
-
- --verity_signer_path
- Specify the signer path to build verity metadata.
"""
import sys
@@ -72,7 +69,6 @@
OPTIONS.replace_verity_public_key = False
OPTIONS.replace_verity_private_key = False
OPTIONS.is_signing = False
-OPTIONS.verity_signer_path = None
def GetCareMap(which, imgname):
"""Generate care_map of system (or vendor) partition"""
@@ -508,8 +504,6 @@
OPTIONS.replace_verity_public_key = (True, a)
elif o == "--is_signing":
OPTIONS.is_signing = True
- elif o == "--verity_signer_path":
- OPTIONS.verity_signer_path = a
else:
return False
return True
@@ -519,8 +513,7 @@
extra_long_opts=["add_missing", "rebuild_recovery",
"replace_verity_public_key=",
"replace_verity_private_key=",
- "is_signing",
- "verity_signer_path="],
+ "is_signing"],
extra_option_handler=option_handler)
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index c51a80c..474ace5 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -69,7 +69,7 @@
return True, int(output)
def GetVerityMetadataSize(partition_size):
- cmd = "system/extras/verity/build_verity_metadata.py -s %d"
+ cmd = "system/extras/verity/build_verity_metadata.py size %d"
cmd %= partition_size
status, output = commands.getstatusoutput(cmd)
@@ -214,11 +214,14 @@
return True
def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt,
- block_device, signer_path, key):
+ block_device, signer_path, key, signer_args):
cmd_template = (
- "system/extras/verity/build_verity_metadata.py %s %s %s %s %s %s %s")
+ "system/extras/verity/build_verity_metadata.py build " +
+ "%s %s %s %s %s %s %s")
cmd = cmd_template % (image_size, verity_metadata_path, root_hash, salt,
block_device, signer_path, key)
+ if signer_args:
+ cmd += " --signer_args=\"%s\"" % (' '.join(signer_args),)
print cmd
status, output = commands.getstatusoutput(cmd)
if status:
@@ -305,10 +308,10 @@
block_dev = prop_dict["verity_block_device"]
signer_key = prop_dict["verity_key"] + ".pk8"
if OPTIONS.verity_signer_path is not None:
- signer_path = OPTIONS.verity_signer_path + ' '
- signer_path += ' '.join(OPTIONS.verity_signer_args)
+ signer_path = OPTIONS.verity_signer_path
else:
signer_path = prop_dict["verity_signer_cmd"]
+ signer_args = OPTIONS.verity_signer_args
# make a tempdir
tempdir_name = tempfile.mkdtemp(suffix="_verity_images")
@@ -327,7 +330,7 @@
root_hash = prop_dict["verity_root_hash"]
salt = prop_dict["verity_salt"]
if not BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt,
- block_dev, signer_path, signer_key):
+ block_dev, signer_path, signer_key, signer_args):
shutil.rmtree(tempdir_name, ignore_errors=True)
return False
