diff options
Diffstat (limited to 'update_verifier')
| -rw-r--r-- | update_verifier/Android.bp | 17 | ||||
| -rw-r--r-- | update_verifier/care_map_generator.py | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp index f6567137e..ff2eff903 100644 --- a/update_verifier/Android.bp +++ b/update_verifier/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_defaults { name: "update_verifier_defaults", @@ -112,12 +121,12 @@ python_binary_host { version: { py2: { - enabled: true, - embedded_launcher: true, - }, - py3: { enabled: false, embedded_launcher: false, }, + py3: { + enabled: true, + embedded_launcher: true, + }, }, } diff --git a/update_verifier/care_map_generator.py b/update_verifier/care_map_generator.py index 051d98deb..c6f2dad24 100644 --- a/update_verifier/care_map_generator.py +++ b/update_verifier/care_map_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2018 The Android Open Source Project # @@ -115,13 +115,13 @@ def main(argv): content = input_care_map.read() if args.parse_proto: - result = ParseProtoMessage(content, args.fingerprint_enabled) + result = ParseProtoMessage(content, args.fingerprint_enabled).encode() else: care_map_proto = GenerateCareMapProtoFromLegacyFormat( content.rstrip().splitlines(), args.fingerprint_enabled) result = care_map_proto.SerializeToString() - with open(args.output_file, 'w') as output: + with open(args.output_file, 'wb') as output: output.write(result) |