diff options
Diffstat (limited to 'update_verifier')
| -rw-r--r-- | update_verifier/Android.bp | 19 | ||||
| -rw-r--r-- | update_verifier/care_map_generator.py | 4 |
2 files changed, 21 insertions, 2 deletions
diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp index ff2eff903..220b007f5 100644 --- a/update_verifier/Android.bp +++ b/update_verifier/Android.bp @@ -33,6 +33,25 @@ cc_defaults { ], } +python_library_host { + name: "care_map_proto_py", + srcs: [ + "care_map.proto", + ], + proto: {type: "lite", canonical_path_from_root: false}, + version: { + py2: { + enabled: true, + }, + py3: { + enabled: true, + }, + }, + visibility: [ + "//build/make/tools/releasetools:__subpackages__", + ], +} + cc_library_static { name: "libupdate_verifier", diff --git a/update_verifier/care_map_generator.py b/update_verifier/care_map_generator.py index c6f2dad24..b1396a43c 100644 --- a/update_verifier/care_map_generator.py +++ b/update_verifier/care_map_generator.py @@ -111,14 +111,14 @@ def main(argv): logging.basicConfig(level=logging.INFO if args.verbose else logging.WARNING, format=logging_format) - with open(args.input_care_map, 'r') as input_care_map: + with open(args.input_care_map, 'rb') as input_care_map: content = input_care_map.read() if args.parse_proto: result = ParseProtoMessage(content, args.fingerprint_enabled).encode() else: care_map_proto = GenerateCareMapProtoFromLegacyFormat( - content.rstrip().splitlines(), args.fingerprint_enabled) + content.decode().rstrip().splitlines(), args.fingerprint_enabled) result = care_map_proto.SerializeToString() with open(args.output_file, 'wb') as output: |