Merge Android 12
Bug: 202323961
Merged-In: I50d3c3ae271f545098f7144c4c29c722f7dad08d
Change-Id: I7dc44f3776d945b2476427be52d8fec6d2e67f71
diff --git a/common/host-side/tradefed/tests/Android.bp b/common/host-side/tradefed/tests/Android.bp
index e73f936..1507796 100644
--- a/common/host-side/tradefed/tests/Android.bp
+++ b/common/host-side/tradefed/tests/Android.bp
@@ -22,9 +22,9 @@
// Restrict visibility to only those targets that need to access it.
visibility: ["//visibility:private"],
- test_options: {
- unit_test: true,
- },
+// test_options: {
+// unit_test: true,
+// },
srcs: ["src/**/*.java"],
java_resource_dirs: ["res"],
diff --git a/common/host-side/util/tests/Android.bp b/common/host-side/util/tests/Android.bp
index 7d29768..109af13 100644
--- a/common/host-side/util/tests/Android.bp
+++ b/common/host-side/util/tests/Android.bp
@@ -23,9 +23,9 @@
// Restrict visibility to only those targets that need to access it.
visibility: ["//visibility:private"],
- test_options: {
- unit_test: true,
- },
+// test_options: {
+// unit_test: true,
+// },
srcs: ["src/**/*.java"],
diff --git a/common/util/Android.bp b/common/util/Android.bp
index 7483106..9d8e35d 100644
--- a/common/util/Android.bp
+++ b/common/util/Android.bp
@@ -20,10 +20,10 @@
java_library_host {
name: "compatibility-common-util-hostsidelib",
// Restrict visibility to only those targets that need to access it.
- visibility: [
- "//test/suite_harness/common/host-side/util",
- "//test/suite_harness/common/util/tests"
- ],
+// visibility: [
+// "//test/suite_harness/common/host-side/util",
+// "//test/suite_harness/common/util/tests"
+// ],
defaults: ["cts_error_prone_rules"],
static_libs: [
diff --git a/common/util/tests/Android.bp b/common/util/tests/Android.bp
index c416cbd..1cd6e63 100644
--- a/common/util/tests/Android.bp
+++ b/common/util/tests/Android.bp
@@ -23,9 +23,9 @@
defaults: ["cts_error_prone_rules"],
srcs: ["src/**/*.java"],
- test_options: {
- unit_test: true,
- },
+// test_options: {
+// unit_test: true,
+// },
static_libs: [
"compatibility-common-util-hostsidelib",
