Merge "Remove Python enables identical to global defaults." am: 5acfb41d4a am: 6fdc0d453f am: 0663a35093

Original change: https://android-review.googlesource.com/c/platform/development/+/2220481

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

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"],
   },

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,
     },

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,
         },
     }

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,
         },
     },

vndk/tools/image-diff-tool/Android.bp

@@ -24,12 +24,4 @@ python_binary_host {
     srcs: [
         "diff.py",
     ],
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-        },
-    }
 }