diff options
Diffstat (limited to 'verity')
| -rw-r--r-- | verity/Android.bp | 7 | ||||
| -rw-r--r-- | verity/build_verity_metadata.py | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/verity/Android.bp b/verity/Android.bp index fc2b827c..ef09528c 100644 --- a/verity/Android.bp +++ b/verity/Android.bp @@ -154,13 +154,8 @@ python_binary_host { name: "build_verity_metadata", srcs: ["build_verity_metadata.py"], version: { - py2: { - enabled: true, - embedded_launcher: true, - }, py3: { - enabled: false, - embedded_launcher: false, + embedded_launcher: true, }, }, } diff --git a/verity/build_verity_metadata.py b/verity/build_verity_metadata.py index 5a7d7d27..52388716 100644 --- a/verity/build_verity_metadata.py +++ b/verity/build_verity_metadata.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2013 The Android Open Source Project # @@ -29,9 +29,9 @@ BLOCK_SIZE = 4096 METADATA_SIZE = BLOCK_SIZE * 8 def run(cmd): - p = subprocess.Popen(cmd, stdout=subprocess.PIPE) + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, text=True) output, _ = p.communicate() - print output + print(output) if p.returncode: exit(-1) @@ -56,7 +56,7 @@ def sign_verity_table(table, signer_path, key_path, signer_args=None): else: args_list = shlex.split(signer_args) cmd = [signer_path] + args_list + [table_file.name, key_path, signature_file.name] - print cmd + print(cmd) run(cmd) return signature_file.read() @@ -109,9 +109,9 @@ if __name__ == "__main__": args = parser.parse_args() if args.dest == 'size': - print get_verity_metadata_size(args.partition_size) + print(get_verity_metadata_size(args.partition_size)) else: - build_verity_metadata(args.blocks / 4096, args.metadata_image, + build_verity_metadata(args.blocks // 4096, args.metadata_image, args.root_hash, args.salt, args.block_device, args.signer_path, args.signing_key, args.signer_args, args.verity_disable) |