Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic89b64fc53e01ae36b3884c117a9242706265327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-20 15:29:43 +00:00
committed by Automerger Merge Worker
parent 74cc53ca0c 3a47e2f6e9
commit 37453749d9
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/Android.bp
View File

@@ -38,23 +38,9 @@ bootstrap_go_package {
pluginFor: ["soong_build"], pluginFor: ["soong_build"],
} }
python_defaults {
name: "python3_version_defaults",
version: {
py2: {
enabled: false,
},
py3: {
enabled: true,
embedded_launcher: false,
},
},
}
python_binary_host { python_binary_host {
name: "api_versions_trimmer", name: "api_versions_trimmer",
srcs: ["api_versions_trimmer.py"], srcs: ["api_versions_trimmer.py"],
defaults: ["python3_version_defaults"],
} }
python_test_host { python_test_host {
@@ -64,7 +50,6 @@ python_test_host {
"api_versions_trimmer_unittests.py", "api_versions_trimmer_unittests.py",
"api_versions_trimmer.py", "api_versions_trimmer.py",
], ],
defaults: ["python3_version_defaults"],
test_options: { test_options: {
unit_test: true, unit_test: true,
}, },
@@ -73,7 +58,6 @@ python_test_host {
python_binary_host { python_binary_host {
name: "merge_annotation_zips", name: "merge_annotation_zips",
srcs: ["merge_annotation_zips.py"], srcs: ["merge_annotation_zips.py"],
defaults: ["python3_version_defaults"],
} }
python_test_host { python_test_host {
@@ -83,7 +67,6 @@ python_test_host {
"merge_annotation_zips.py", "merge_annotation_zips.py",
"merge_annotation_zips_test.py", "merge_annotation_zips_test.py",
], ],
defaults: ["python3_version_defaults"],
test_options: { test_options: {
unit_test: true, unit_test: true,
}, },

5
tools/fonts/Android.bp
View File

@@ -24,12 +24,7 @@ package {
python_defaults { python_defaults {
name: "fonts_python_defaults", name: "fonts_python_defaults",
version: { version: {
py2: {
enabled: false,
embedded_launcher: false,
},
py3: { py3: {
enabled: true,
embedded_launcher: true, embedded_launcher: true,
}, },
}, },