commit cf6787a03511b2fafa787d5335cceeda20b13a14
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 12 22:42:49 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 12 22:42:49 2022 +0000
tree 67f040c621e044e87aaac57833fc73c9f1be775a
parent 9e353821870bd5983edc61dd0e72a27846b431a9
parent a0ef72ec5fde410ee792b01a0d7772a7aa003763

Merge "Remove py2 usages" am: a773d405d1 am: a0ef72ec5f

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

Change-Id: Ide4a814793673b7d8e95c33474effc355725b40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

update_verifier/Android.bp

diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp
index 3c4ec4a..26ff530 100644
--- a/update_verifier/Android.bp
+++ b/update_verifier/Android.bp
@@ -39,14 +39,6 @@
         "care_map.proto",
     ],
     proto: {type: "lite", canonical_path_from_root: false},
-    version: {
-        py2: {
-            enabled: true,
-        },
-        py3: {
-            enabled: true,
-        },
-    },
     visibility: [
         "//build/make/tools/releasetools:__subpackages__",
     ],
@@ -145,12 +137,7 @@
     },
 
     version: {
-        py2: {
-            enabled: false,
-            embedded_launcher: false,
-        },
         py3: {
-            enabled: true,
             embedded_launcher: true,
         },
     },