Snap for 13152920 from 66c27da00aad477016f86eac58b1177a5c663990 to 25Q2-release
Change-Id: I86c1e4da53593b25c76f6a6a8062b4f5298d94cd
diff --git a/ext4_utils/Android.bp b/ext4_utils/Android.bp
index 4db055b..7195a85 100644
--- a/ext4_utils/Android.bp
+++ b/ext4_utils/Android.bp
@@ -72,13 +72,6 @@
"mke2fs.conf",
],
- version: {
- py3: {
- enabled: true,
- embedded_launcher: true,
- },
- },
-
required: [
"mke2fs",
"e2fsdroid",
diff --git a/perf2cfg/Android.bp b/perf2cfg/Android.bp
index 6e4efe9..9419ef3 100644
--- a/perf2cfg/Android.bp
+++ b/perf2cfg/Android.bp
@@ -49,9 +49,4 @@
test_options: {
unit_test: true,
},
- version: {
- py3: {
- embedded_launcher: true,
- },
- },
}
diff --git a/perf_tools/Android.bp b/perf_tools/Android.bp
index 26b9351..7a3fe5d 100644
--- a/perf_tools/Android.bp
+++ b/perf_tools/Android.bp
@@ -22,10 +22,7 @@
python_binary_host {
name: "progress_report",
srcs: ["progress_report.py"],
- libs: [ "report_proto",],
- version: {
- py3: { embedded_launcher: true },
- },
+ libs: ["report_proto"],
main: "progress_report.py",
}
diff --git a/torq/Android.bp b/torq/Android.bp
index 7d2d1ed..6546f0f 100644
--- a/torq/Android.bp
+++ b/torq/Android.bp
@@ -35,12 +35,7 @@
main: "tests/torq_unit_test.py",
srcs: ["tests/torq_unit_test.py"],
defaults: ["torq_defaults"],
- version: {
- py3: {
- enabled: true,
- embedded_launcher: false,
- },
- },
+ embedded_launcher: false,
test_options: {
unit_test: true,
},
@@ -51,12 +46,7 @@
main: "tests/device_unit_test.py",
srcs: ["tests/device_unit_test.py"],
defaults: ["torq_defaults"],
- version: {
- py3: {
- enabled: true,
- embedded_launcher: false,
- },
- },
+ embedded_launcher: false,
test_options: {
unit_test: true,
},
@@ -67,12 +57,7 @@
main: "tests/config_builder_unit_test.py",
srcs: ["tests/config_builder_unit_test.py"],
defaults: ["torq_defaults"],
- version: {
- py3: {
- enabled: true,
- embedded_launcher: false,
- },
- },
+ embedded_launcher: false,
test_options: {
unit_test: true,
},
@@ -83,12 +68,7 @@
main: "tests/perfetto_command_executor_unit_test.py",
srcs: ["tests/perfetto_command_executor_unit_test.py"],
defaults: ["torq_defaults"],
- version: {
- py3: {
- enabled: true,
- embedded_launcher: false,
- },
- },
+ embedded_launcher: false,
test_options: {
unit_test: true,
},
@@ -99,12 +79,7 @@
main: "tests/validate_simpleperf_unit_test.py",
srcs: ["tests/validate_simpleperf_unit_test.py"],
defaults: ["torq_defaults"],
- version: {
- py3: {
- enabled: true,
- embedded_launcher: false,
- },
- },
+ embedded_launcher: false,
test_options: {
unit_test: true,
},
@@ -115,12 +90,7 @@
main: "tests/utils_unit_test.py",
srcs: ["tests/utils_unit_test.py"],
defaults: ["torq_defaults"],
- version: {
- py3: {
- enabled: true,
- embedded_launcher: false,
- },
- },
+ embedded_launcher: false,
test_options: {
unit_test: true,
},
@@ -131,12 +101,7 @@
main: "tests/open_ui_unit_test.py",
srcs: ["tests/open_ui_unit_test.py"],
defaults: ["torq_defaults"],
- version: {
- py3: {
- enabled: true,
- embedded_launcher: false,
- },
- },
+ embedded_launcher: false,
test_options: {
unit_test: true,
},
diff --git a/verity/Android.bp b/verity/Android.bp
index f2e3f0b..2514885 100644
--- a/verity/Android.bp
+++ b/verity/Android.bp
@@ -157,9 +157,4 @@
python_binary_host {
name: "build_verity_metadata",
srcs: ["build_verity_metadata.py"],
- version: {
- py3: {
- embedded_launcher: true,
- },
- },
}