commit 634e72e44471aa74faeecf06e5f1accfe26821b6
author android-build-team Robot <android-build-team-robot@google.com> Sat Feb 27 04:02:07 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Feb 27 04:02:07 2021 +0000
tree 18440c1e64c88de64167db4afa4fa03f50f96433
parent a10b3d38b7b0db876eb142e2f22f0ee9a61dcb8f
parent 631bb1cbe84415c95c1c01dfa6d4249d905ee52b

Snap for 7172757 from 631bb1cbe84415c95c1c01dfa6d4249d905ee52b to tm-release

Change-Id: I359a262a8e852ee214baf1c4a9aed4919837a8b1

update_verifier/Android.bp

diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp
index f9a8341..ff2eff9 100644
--- a/update_verifier/Android.bp
+++ b/update_verifier/Android.bp
@@ -121,12 +121,12 @@
 
     version: {
         py2: {
-            enabled: true,
-            embedded_launcher: true,
-        },
-        py3: {
             enabled: false,
             embedded_launcher: false,
         },
+        py3: {
+            enabled: true,
+            embedded_launcher: true,
+        },
     },
 }

update_verifier/care_map_generator.py

diff --git a/update_verifier/care_map_generator.py b/update_verifier/care_map_generator.py
index 051d98d..c6f2dad 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 @@
     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)