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

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

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

Change-Id: Id290d6dda14e8ff771d40499116eb11d448dd0ce
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,
         },
     },