Revert "Add rust_test modules." am: c0005ccc40 am: 54b0531cd1

am: 700eaa9c8a

Change-Id: I610897067f70272044cb0388b5dd5dea1a42f153

3 files changed, 7 insertions, 57 deletions

diff --git a/audio_streams/Android.bp b/audio_streams/Android.bp
index 53143245..3e78e566 100644
--- a/audio_streams/Android.bp
+++ b/audio_streams/Android.bp
@@ -1,19 +1,7 @@
-// This file is generated by cargo2android.py.
-
-rust_test_host {
-    name: "audio_streams_tests_audio_streams",
-    crate_name: "audio_streams",
-    srcs: ["src/audio_streams.rs"],
-    relative_install_path: "audio_streams_tests",
-    // auto_gen_config is waiting for build/soong changes.
-    // test_suites: ["general-tests"],
-    // auto_gen_config: true,
-    edition: "2018",
-}
-
 rust_library_host_rlib {
     name: "libaudio_streams",
+    deny_warnings: false,
     crate_name: "audio_streams",
-    srcs: ["src/audio_streams.rs"],
     edition: "2018",
+    srcs: ["src/audio_streams.rs"],
 }
diff --git a/cras/client/cras-sys/Android.bp b/cras/client/cras-sys/Android.bp
index 666311c7..0e061b1b 100644
--- a/cras/client/cras-sys/Android.bp
+++ b/cras/client/cras-sys/Android.bp
@@ -1,25 +1,8 @@
-// This file is generated by cargo2android.py.
-
-rust_test_host {
-    name: "cras-sys_tests_cras_sys",
-    crate_name: "cras_sys",
-    srcs: ["src/lib.rs"],
-    relative_install_path: "cras-sys_tests",
-    // auto_gen_config is waiting for build/soong changes.
-    // test_suites: ["general-tests"],
-    // auto_gen_config: true,
-    edition: "2015",
-    rlibs: [
-        "libdata_model",
-    ],
-}
-
 rust_library_host_rlib {
     name: "libcras_sys",
+    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/libcras/Android.bp b/cras/client/libcras/Android.bp
index ba0f37bc..3c0b3ede 100644
--- a/cras/client/libcras/Android.bp
+++ b/cras/client/libcras/Android.bp
@@ -1,35 +1,14 @@
-// This file is generated by cargo2android.py.
-
-rust_test_host {
-    name: "libcras_tests_libcras",
-    deny_warnings: false,
-    crate_name: "libcras",
-    srcs: ["src/libcras.rs"],
-    relative_install_path: "libcras_tests",
-    // auto_gen_config is waiting for build/soong changes.
-    // test_suites: ["general-tests"],
-    // auto_gen_config: true,
-    edition: "2018",
-    rlibs: [
-        "libaudio_streams",
-        "libcras_sys",
-        "libdata_model",
-        "liblibc",
-        "libsys_util",
-    ],
-}
-
 rust_library_host_rlib {
     name: "liblibcras",
     deny_warnings: false,
     crate_name: "libcras",
-    srcs: ["src/libcras.rs"],
     edition: "2018",
+    srcs: ["src/libcras.rs"],
     rlibs: [
+        "liblibc",
         "libaudio_streams",
         "libcras_sys",
         "libdata_model",
-        "liblibc",
         "libsys_util",
     ],
 }