diff options
| author | 2022-09-20 00:47:01 +0000 | |
|---|---|---|
| committer | 2022-09-20 00:47:01 +0000 | |
| commit | 3fd51ff02a1f13c701756fcd42525d623bec7b25 (patch) | |
| tree | eb39e206acffaf126cdf7ba634dfc7c62816f89b | |
| parent | 4339e51473d2f57512be53d3c2bbb1cb6f28271c (diff) | |
| parent | 3fb6fc6b11d8d8621ddc4622fa3170c47a871d03 (diff) | |
Merge "Remove Python enables identical to global defaults."
| -rw-r--r-- | api/Android.bp | 17 | ||||
| -rw-r--r-- | tools/fonts/Android.bp | 5 |
2 files changed, 0 insertions, 22 deletions
diff --git a/api/Android.bp b/api/Android.bp index 9fb7b35605b8..505d7bf99135 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -38,23 +38,9 @@ bootstrap_go_package { 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 @@ python_test_host { "api_versions_trimmer_unittests.py", "api_versions_trimmer.py", ], - defaults: ["python3_version_defaults"], test_options: { unit_test: true, }, @@ -73,7 +58,6 @@ python_test_host { python_binary_host { name: "merge_annotation_zips", srcs: ["merge_annotation_zips.py"], - defaults: ["python3_version_defaults"], } python_test_host { @@ -83,7 +67,6 @@ python_test_host { "merge_annotation_zips.py", "merge_annotation_zips_test.py", ], - defaults: ["python3_version_defaults"], test_options: { unit_test: true, }, diff --git a/tools/fonts/Android.bp b/tools/fonts/Android.bp index eeb9e3ceda1e..f8629f9bd0b8 100644 --- a/tools/fonts/Android.bp +++ b/tools/fonts/Android.bp @@ -24,12 +24,7 @@ package { python_defaults { name: "fonts_python_defaults", version: { - py2: { - enabled: false, - embedded_launcher: false, - }, py3: { - enabled: true, embedded_launcher: true, }, }, |