commit 57b8f5b3205bf3d9d6b5ad5812e916b9643512bc
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 26 02:00:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 26 02:00:39 2021 +0000
tree d988bb166f18b7b92cd34b7a8d6da59201d631f2
parent 8d12226c10507644b8c09fc065c20ef9dd027f94
parent 79f73eea4bce47d9ea515a8eddb31481b53fcefa

Merge "Switch care_map_generator.py to Python 3." am: f2e577eda8 am: 79f73eea4b

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1606758

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a060dc53993f258a0bc871adc5fed3d98bff6d4

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)