From 45c7ebda063e808d804e44a133a8d71e6a8bdc70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= <krzysio@google.com>
Date: Sat, 17 Sep 2022 11:33:50 +0000
Subject: [PATCH] Remove Python enables identical to global defaults.

Bug: 245854393
Test: presubmit
Change-Id: I9bb5cbd972432a26afcb13d7c2a6bbc73fb0991f
---
 gsi/repack_super_image/Android.bp          |  9 ---------
 scripts/Android.bp                         | 10 ----------
 tools/ninja_dependency_analysis/Android.bp |  4 ----
 vndk/tools/elfcheck/Android.bp             |  4 ----
 vndk/tools/image-diff-tool/Android.bp      |  8 --------
 5 files changed, 35 deletions(-)

diff --git a/gsi/repack_super_image/Android.bp b/gsi/repack_super_image/Android.bp
index 1f1c7e2aa..5ceb5bee1 100644
--- a/gsi/repack_super_image/Android.bp
+++ b/gsi/repack_super_image/Android.bp
@@ -22,15 +22,6 @@ python_binary_host {
   srcs: [
     "repack_super_image.py",
   ],
-  version: {
-    py2: {
-      enabled: false,
-    },
-    py3: {
-      enabled: true,
-      embedded_launcher: false,
-    },
-  },
   dist: {
     targets: ["gsi_utils"],
   },
diff --git a/scripts/Android.bp b/scripts/Android.bp
index 143fdfd17..1fc41514b 100644
--- a/scripts/Android.bp
+++ b/scripts/Android.bp
@@ -44,16 +44,6 @@ python_test_host {
         ":llvm-tools",
     ],
     libs: ["python-symbol"],
-    version: {
-        py2: {
-            enabled: false,
-            embedded_launcher: false,
-        },
-        py3: {
-            enabled: true,
-            embedded_launcher: false,
-        },
-    },
     test_options: {
         unit_test: true,
     },
diff --git a/tools/ninja_dependency_analysis/Android.bp b/tools/ninja_dependency_analysis/Android.bp
index cda0ba813..db3cd8ab9 100644
--- a/tools/ninja_dependency_analysis/Android.bp
+++ b/tools/ninja_dependency_analysis/Android.bp
@@ -16,11 +16,7 @@ python_binary_host {
         canonical_path_from_root: false,
     },
     version: {
-        py2: {
-            enabled: false,
-        },
         py3: {
-            enabled: true,
             embedded_launcher: true,
         },
     }
diff --git a/vndk/tools/elfcheck/Android.bp b/vndk/tools/elfcheck/Android.bp
index 3cd6279d7..e7e4877bd 100644
--- a/vndk/tools/elfcheck/Android.bp
+++ b/vndk/tools/elfcheck/Android.bp
@@ -38,11 +38,7 @@ python_binary_host {
         "fix_android_mk_prebuilt.py",
     ],
     version: {
-        py2: {
-            enabled: false,
-        },
         py3: {
-            enabled: true,
             embedded_launcher: true,
         },
     },
diff --git a/vndk/tools/image-diff-tool/Android.bp b/vndk/tools/image-diff-tool/Android.bp
index ac5936eb9..369732fa2 100644
--- a/vndk/tools/image-diff-tool/Android.bp
+++ b/vndk/tools/image-diff-tool/Android.bp
@@ -24,12 +24,4 @@ python_binary_host {
     srcs: [
         "diff.py",
     ],
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-        },
-    }
 }