Revert "Add rust_test modules." am: f2e974bdf4 am: cb5bcd18c9

am: f574215d77

Change-Id: Iaf1eb327ae802363daebe0659e45fbab7f485516

5 files changed, 1 insertions, 123 deletions

diff --git a/bit_field/Android.bp b/bit_field/Android.bp
index d8b6876f0..21bf9e731 100644
--- a/bit_field/Android.bp
+++ b/bit_field/Android.bp
@@ -1,33 +1,5 @@
 // This file is generated by cargo2android.py.
 
-rust_test_host {
-    name: "bit_field_tests",
-    crate_name: "bit_field",
-    srcs: [
-        "tests/test_enum.rs",
-        "tests/test_tuple_struct.rs",
-    ],
-    relative_install_path: "bit_field_tests",
-    edition: "2018",
-    rlibs: [
-        "libbit_field",
-    ],
-    proc_macros: [
-        "libbit_field_derive",
-    ],
-}
-
-rust_test_host {
-    name: "bit_field_tests_bit_field",
-    crate_name: "bit_field",
-    srcs: ["src/lib.rs"],
-    relative_install_path: "bit_field_tests",
-    edition: "2018",
-    proc_macros: [
-        "libbit_field_derive",
-    ],
-}
-
 rust_library_host_rlib {
     name: "libbit_field",
     crate_name: "bit_field",
diff --git a/kvm/Android.bp b/kvm/Android.bp
index a5d0ab58d..85c5b753b 100644
--- a/kvm/Android.bp
+++ b/kvm/Android.bp
@@ -1,38 +1,5 @@
 // This file is generated by cargo2android.py.
 
-rust_test_host {
-    name: "kvm_tests",
-    crate_name: "kvm",
-    srcs: [
-        "tests/dirty_log.rs",
-        "tests/read_only_memory.rs",
-        "tests/real_run_adder.rs",
-    ],
-    relative_install_path: "kvm_tests",
-    edition: "2018",
-    rlibs: [
-        "libkvm",
-        "libkvm_sys",
-        "liblibc",
-        "libmsg_socket",
-        "libsys_util",
-    ],
-}
-
-rust_test_host {
-    name: "kvm_tests_kvm",
-    crate_name: "kvm",
-    srcs: ["src/lib.rs"],
-    relative_install_path: "kvm_tests",
-    edition: "2018",
-    rlibs: [
-        "libkvm_sys",
-        "liblibc",
-        "libmsg_socket",
-        "libsys_util",
-    ],
-}
-
 rust_library_host_rlib {
     name: "libkvm",
     crate_name: "kvm",
diff --git a/kvm_sys/Android.bp b/kvm_sys/Android.bp
index 6423a7b25..dc2629d00 100644
--- a/kvm_sys/Android.bp
+++ b/kvm_sys/Android.bp
@@ -1,30 +1,5 @@
 // This file is generated by cargo2android.py.
 
-rust_test_host {
-    name: "kvm_sys_tests_kvm_sys",
-    crate_name: "kvm_sys",
-    srcs: ["src/lib.rs"],
-    relative_install_path: "kvm_sys_tests",
-    edition: "2018",
-    rlibs: [
-        "liblibc",
-        "libsys_util",
-    ],
-}
-
-rust_test_host {
-    name: "kvm_sys_tests_sanity",
-    crate_name: "sanity",
-    srcs: ["tests/sanity.rs"],
-    relative_install_path: "kvm_sys_tests",
-    edition: "2018",
-    rlibs: [
-        "libkvm_sys",
-        "liblibc",
-        "libsys_util",
-    ],
-}
-
 rust_library_host_rlib {
     name: "libkvm_sys",
     crate_name: "kvm_sys",
diff --git a/msg_socket/Android.bp b/msg_socket/Android.bp
index dceb8c954..c36feda58 100644
--- a/msg_socket/Android.bp
+++ b/msg_socket/Android.bp
@@ -13,38 +13,3 @@ rust_library_host_rlib {
         "libmsg_on_socket_derive",
     ],
 }
-
-rust_test_host {
-    name: "msg_socket_tests",
-    crate_name: "msg_socket",
-    srcs: [
-        "tests/enum.rs",
-        "tests/struct.rs",
-        "tests/tuple.rs",
-        "tests/unit.rs",
-    ],
-    relative_install_path: "msg_socket_tests",
-    edition: "2018",
-    rlibs: [
-        "libdata_model",
-        "libmsg_socket",
-        "libsys_util",
-    ],
-    proc_macros: [
-        "libmsg_on_socket_derive",
-    ],
-}
-
-rust_test_host {
-    name: "msg_socket_tests_msg_socket",
-    crate_name: "msg_socket",
-    srcs: ["src/lib.rs"],
-    relative_install_path: "msg_socket_tests",
-    rlibs: [
-        "libdata_model",
-        "libsys_util",
-    ],
-    proc_macros: [
-        "libmsg_on_socket_derive",
-    ],
-}
diff --git a/sys_util/Android.bp b/sys_util/Android.bp
index 65a35bbdc..ab1f65144 100644
--- a/sys_util/Android.bp
+++ b/sys_util/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py, manually added "libcap".
+// This file is generated by cargo2android.py.
 
 rust_library_host_rlib {
     name: "libsys_util",
@@ -15,5 +15,4 @@ rust_library_host_rlib {
     proc_macros: [
         "libpoll_token_derive",
     ],
-    shared_libs: ["libcap"],  // specified in src/capabilities.rs
 }