Revert submission am: 925486576e am: 113e18402d

am: c12ac1da9f

Change-Id: I85d1222dcbb90449ba4ea1ddeab3f347e6965a92

6 files changed, 5 insertions, 77 deletions

diff --git a/audio_streams/Android.bp b/audio_streams/Android.bp
index cbb67437..95b816b0 100644
--- a/audio_streams/Android.bp
+++ b/audio_streams/Android.bp
@@ -1,18 +1,7 @@
-// This file is generated by cargo2android.py, added defaults.
-
-rust_test_host {
-    name: "audio_streams_tests_audio_streams",
-    defaults: ["crosvm_defaults"],
-    crate_name: "audio_streams",
-    srcs: ["src/audio_streams.rs"],
-    relative_install_path: "audio_streams_tests",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-}
-
 rust_library_host_rlib {
     name: "libaudio_streams",
     defaults: ["crosvm_defaults"],
+    deny_warnings: false,
     crate_name: "audio_streams",
     srcs: ["src/audio_streams.rs"],
 }
diff --git a/audio_streams/TEST_MAPPING b/audio_streams/TEST_MAPPING
deleted file mode 100644
index ce60830a..00000000
--- a/audio_streams/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "audio_streams_tests_audio_streams",
-      "host": true
-    }
-  ]
-}
diff --git a/cras/client/cras-sys/Android.bp b/cras/client/cras-sys/Android.bp
index 2a90f8f9..46ed7b8c 100644
--- a/cras/client/cras-sys/Android.bp
+++ b/cras/client/cras-sys/Android.bp
@@ -1,26 +1,9 @@
-// This file is generated by cargo2android.py, added defaults.
-
-rust_test_host {
-    name: "cras-sys_tests_cras_sys",
-    defaults: ["crosvm_defaults"],
-    crate_name: "cras_sys",
-    srcs: ["src/lib.rs"],
-    relative_install_path: "cras-sys_tests",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2015",
-    rlibs: [
-        "libdata_model",
-    ],
-}
-
 rust_library_host_rlib {
     name: "libcras_sys",
     defaults: ["crosvm_defaults"],
+    deny_warnings: false,
     crate_name: "cras_sys",
-    srcs: ["src/lib.rs"],
     edition: "2015",
-    rlibs: [
-        "libdata_model",
-    ],
+    rlibs: ["libdata_model"],
+    srcs: ["src/lib.rs"],
 }
diff --git a/cras/client/cras-sys/TEST_MAPPING b/cras/client/cras-sys/TEST_MAPPING
deleted file mode 100644
index 3c63a45e..00000000
--- a/cras/client/cras-sys/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "cras-sys_tests_cras_sys",
-      "host": true
-    }
-  ]
-}
diff --git a/cras/client/libcras/Android.bp b/cras/client/libcras/Android.bp
index 33c4ddb1..f3971915 100644
--- a/cras/client/libcras/Android.bp
+++ b/cras/client/libcras/Android.bp
@@ -1,23 +1,3 @@
-// This file is generated by cargo2android.py, added defaults.
-
-rust_test_host {
-    name: "libcras_tests_libcras",
-    defaults: ["crosvm_defaults"],
-    deny_warnings: false,
-    crate_name: "libcras",
-    srcs: ["src/libcras.rs"],
-    relative_install_path: "libcras_tests",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    rlibs: [
-        "libaudio_streams",
-        "libcras_sys",
-        "libdata_model",
-        "liblibc",
-        "libsys_util",
-    ],
-}
-
 rust_library_host_rlib {
     name: "liblibcras",
     defaults: ["crosvm_defaults"],
@@ -25,10 +5,10 @@ rust_library_host_rlib {
     crate_name: "libcras",
     srcs: ["src/libcras.rs"],
     rlibs: [
+        "liblibc",
         "libaudio_streams",
         "libcras_sys",
         "libdata_model",
-        "liblibc",
         "libsys_util",
     ],
 }
diff --git a/cras/client/libcras/TEST_MAPPING b/cras/client/libcras/TEST_MAPPING
deleted file mode 100644
index ecddeebe..00000000
--- a/cras/client/libcras/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "libcras_tests_libcras",
-      "host": true
-    }
-  ]
-}