Update to aosp/crosvm-master e65070b6531
* merge in e65070b653154252b7c66ec983c8df842f932f77
* limit rust libraries to host only for now
Bug: 151628085
Test: make
Test: atest --host -c --include-subdirs external/adhd
Change-Id: I6cde59a822cd93c69ab060bc383f1fb8c116ec92
diff --git a/audio_streams/Android.bp b/audio_streams/Android.bp
index e3cefd1..31f5700 100644
--- a/audio_streams/Android.bp
+++ b/audio_streams/Android.bp
@@ -1,9 +1,18 @@
// This file is generated by cargo2android.py, then manually added defaults.
-rust_library_rlib {
+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"],
- host_supported: true,
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 4194e25..fbaa86a 100644
--- a/cras/client/cras-sys/Android.bp
+++ b/cras/client/cras-sys/Android.bp
@@ -1,10 +1,24 @@
// This file is generated by cargo2android.py, then manually added defaults.
-rust_library_rlib {
+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,
+ rlibs: [
+ "libdata_model",
+ ],
+}
+
+rust_library_host_rlib {
name: "libcras_sys",
defaults: ["crosvm_defaults"],
- host_supported: true,
crate_name: "cras_sys",
- rlibs: ["libdata_model"],
srcs: ["src/lib.rs"],
+ 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 3721781..8852392 100644
--- a/cras/client/libcras/Android.bp
+++ b/cras/client/libcras/Android.bp
@@ -1,9 +1,31 @@
// This file is generated by cargo2android.py, then added manually defaults.
+// Added libcap to link, which was not sepcified in cargo build rules.
+
+rust_test_host {
+ name: "libcras_tests_libcras",
+ defaults: ["crosvm_defaults"],
+ 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",
+ "libsync_rust",
+ "libsys_util",
+ ],
+ shared_libs: [
+ "libcap",
+ ],
+}
+
rust_library_host_rlib {
name: "liblibcras",
defaults: ["crosvm_defaults"],
- deny_warnings: false,
crate_name: "libcras",
srcs: ["src/libcras.rs"],
rlibs: [
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
+ }
+ ]
+}
