Snap for 6047681 from 7756bb5f946f4079c6255535943c8f753ac3b282 to rvc-release
Change-Id: I9998ae9f3c07bf7e003c6677b1a17f300acf5f72
diff --git a/audio_streams/Android.bp b/audio_streams/Android.bp
index 95b816b..cbb6743 100644
--- a/audio_streams/Android.bp
+++ b/audio_streams/Android.bp
@@ -1,7 +1,18 @@
+// 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
new file mode 100644
index 0000000..ce60830
--- /dev/null
+++ b/audio_streams/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+ "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 46ed7b8..2a90f8f 100644
--- a/cras/client/cras-sys/Android.bp
+++ b/cras/client/cras-sys/Android.bp
@@ -1,9 +1,26 @@
+// 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",
- edition: "2015",
- rlibs: ["libdata_model"],
srcs: ["src/lib.rs"],
+ edition: "2015",
+ rlibs: [
+ "libdata_model",
+ ],
}
diff --git a/cras/client/cras-sys/TEST_MAPPING b/cras/client/cras-sys/TEST_MAPPING
new file mode 100644
index 0000000..3c63a45
--- /dev/null
+++ b/cras/client/cras-sys/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+ "presubmit": [
+ {
+ "name": "cras-sys_tests_cras_sys",
+ "host": true
+ }
+ ]
+}
diff --git a/cras/client/libcras/Android.bp b/cras/client/libcras/Android.bp
index f397191..33c4ddb 100644
--- a/cras/client/libcras/Android.bp
+++ b/cras/client/libcras/Android.bp
@@ -1,3 +1,23 @@
+// 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"],
@@ -5,10 +25,10 @@
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
new file mode 100644
index 0000000..ecddeeb
--- /dev/null
+++ b/cras/client/libcras/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+ "presubmit": [
+ {
+ "name": "libcras_tests_libcras",
+ "host": true
+ }
+ ]
+}
