1 files changed, 5 insertions, 48 deletions
diff --git a/audio_streams/Android.bp b/audio_streams/Android.bp
index 2909b544..cbb67437 100644
--- a/audio_streams/Android.bp
+++ b/audio_streams/Android.bp
@@ -1,61 +1,18 @@
-// This file is generated by cargo2android.py --run --device --test --global_defaults=crosvm_defaults --dependencies.
+// This file is generated by cargo2android.py, added defaults.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_adhd_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_adhd_license"],
-}
-
-rust_defaults {
-    name: "audio_streams_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,
-    edition: "2018",
-    rustlibs: [
-        "libsync_rust",
-        "libsys_util",
-    ],
 }
 
-rust_test_host {
-    name: "audio_streams_host_test_src_audio_streams",
-    defaults: ["audio_streams_defaults"],
-}
-
-rust_test {
-    name: "audio_streams_device_test_src_audio_streams",
-    defaults: ["audio_streams_defaults"],
-}
-
-rust_library {
+rust_library_host_rlib {
     name: "libaudio_streams",
     defaults: ["crosvm_defaults"],
-    host_supported: true,
     crate_name: "audio_streams",
     srcs: ["src/audio_streams.rs"],
-    edition: "2018",
-    rustlibs: [
-        "libsync_rust",
-        "libsys_util",
-    ],
 }
-
-// dependent_library ["feature_list"]
-//   ../../crosvm/assertions/src/lib.rs
-//   ../../crosvm/data_model/src/lib.rs
-//   ../../crosvm/sync/src/lib.rs
-//   ../../crosvm/sys_util/poll_token_derive/poll_token_derive.rs
-//   ../../crosvm/sys_util/src/lib.rs
-//   ../../crosvm/syscall_defines/src/lib.rs
-//   ../../crosvm/tempfile/src/lib.rs
-//   libc-0.2.76 "default,std"
-//   proc-macro2-1.0.19 "default,proc-macro"
-//   quote-1.0.7 "default,proc-macro"
-//   syn-1.0.39 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-//   unicode-xid-0.2.1 "default"