commit c7fa453c81bb97709767cf6760d40b5dd0594965
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 20 16:10:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 20 16:10:55 2022 +0000
tree a3ae608b334c6294eabee6f42a150d641dacec1c
parent 0ef0048f71a42eab7d2b028e0086ec43fc8becef
parent 37453749d911c5d3af7141e6a4d0ae5cd96bf549

Merge "Remove Python enables identical to global defaults." am: 3fd51ff02a am: a728156a2d am: 1c9e3b6c5a am: 3a47e2f6e9 am: 37453749d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220474

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

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index e9930e3..29eaec6 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -38,23 +38,9 @@
     pluginFor: ["soong_build"],
 }
 
-python_defaults {
-    name: "python3_version_defaults",
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-            embedded_launcher: false,
-        },
-    },
-}
-
 python_binary_host {
     name: "api_versions_trimmer",
     srcs: ["api_versions_trimmer.py"],
-    defaults: ["python3_version_defaults"],
 }
 
 python_test_host {
@@ -64,7 +50,6 @@
         "api_versions_trimmer_unittests.py",
         "api_versions_trimmer.py",
     ],
-    defaults: ["python3_version_defaults"],
     test_options: {
         unit_test: true,
     },
@@ -73,7 +58,6 @@
 python_binary_host {
     name: "merge_annotation_zips",
     srcs: ["merge_annotation_zips.py"],
-    defaults: ["python3_version_defaults"],
 }
 
 python_test_host {
@@ -83,7 +67,6 @@
         "merge_annotation_zips.py",
         "merge_annotation_zips_test.py",
     ],
-    defaults: ["python3_version_defaults"],
     test_options: {
         unit_test: true,
     },

tools/fonts/Android.bp

diff --git a/tools/fonts/Android.bp b/tools/fonts/Android.bp
index eeb9e3c..f8629f9 100644
--- a/tools/fonts/Android.bp
+++ b/tools/fonts/Android.bp
@@ -24,12 +24,7 @@
 python_defaults {
     name: "fonts_python_defaults",
     version: {
-        py2: {
-            enabled: false,
-            embedded_launcher: false,
-        },
         py3: {
-            enabled: true,
             embedded_launcher: true,
         },
     },