Revert submission
am: 44c5ab22cb
Change-Id: Idbd3f76bc93599258e55a37eb837d173b4edc9a3
diff --git a/bit_field/Android.bp b/bit_field/Android.bp
index 35b510c..ecf1649 100644
--- a/bit_field/Android.bp
+++ b/bit_field/Android.bp
@@ -1,36 +1,4 @@
-// This file is generated by cargo2android.py, added defaults.
-
-rust_test_host {
- name: "bit_field_tests",
- defaults: ["crosvm_defaults"],
- crate_name: "bit_field",
- srcs: [
- "tests/test_enum.rs",
- "tests/test_tuple_struct.rs",
- ],
- relative_install_path: "bit_field_tests",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- rlibs: [
- "libbit_field",
- ],
- proc_macros: [
- "libbit_field_derive",
- ],
-}
-
-rust_test_host {
- name: "bit_field_tests_bit_field",
- defaults: ["crosvm_defaults"],
- crate_name: "bit_field",
- srcs: ["src/lib.rs"],
- relative_install_path: "bit_field_tests",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- proc_macros: [
- "libbit_field_derive",
- ],
-}
+// This file is generated by cargo2android.py.
rust_library_host_rlib {
name: "libbit_field",
diff --git a/bit_field/TEST_MAPPING b/bit_field/TEST_MAPPING
deleted file mode 100644
index 56d157e..0000000
--- a/bit_field/TEST_MAPPING
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "presubmit": [
- {
- "name": "bit_field_tests_test_enum",
- "host": true
- },
- {
- "name": "bit_field_tests_test_tuple_struct",
- "host": true
- },
- {
- "name": "bit_field_tests_bit_field",
- "host": true
- }
- ]
-}
diff --git a/kvm/Android.bp b/kvm/Android.bp
index 2230316..242ca4d 100644
--- a/kvm/Android.bp
+++ b/kvm/Android.bp
@@ -1,41 +1,4 @@
-// This file is generated by cargo2android.py, added defaults.
-
-rust_test_host {
- name: "kvm_tests",
- defaults: ["crosvm_defaults"],
- crate_name: "kvm",
- srcs: [
- "tests/dirty_log.rs",
- "tests/read_only_memory.rs",
- "tests/real_run_adder.rs",
- ],
- relative_install_path: "kvm_tests",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- rlibs: [
- "libkvm",
- "libkvm_sys",
- "liblibc",
- "libmsg_socket",
- "libsys_util",
- ],
-}
-
-rust_test_host {
- name: "kvm_tests_kvm",
- defaults: ["crosvm_defaults"],
- crate_name: "kvm",
- srcs: ["src/lib.rs"],
- relative_install_path: "kvm_tests",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- rlibs: [
- "libkvm_sys",
- "liblibc",
- "libmsg_socket",
- "libsys_util",
- ],
-}
+// This file is generated by cargo2android.py.
rust_library_host_rlib {
name: "libkvm",
diff --git a/kvm/TEST_MAPPING b/kvm/TEST_MAPPING
deleted file mode 100644
index af23db1..0000000
--- a/kvm/TEST_MAPPING
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "presubmit": [
- {
- "name": "kvm_tests_dirty_log",
- "host": true
- },
- {
- "name": "kvm_tests_read_only_memory",
- "host": true
- },
- {
- "name": "kvm_tests_real_run_adder",
- "host": true
- },
- {
- "name": "kvm_tests_kvm",
- "host": true
- }
- ]
-}
diff --git a/kvm_sys/Android.bp b/kvm_sys/Android.bp
index 4614df1..bb7a4f1 100644
--- a/kvm_sys/Android.bp
+++ b/kvm_sys/Android.bp
@@ -1,33 +1,4 @@
-// This file is generated by cargo2android.py, added defaults.
-
-rust_test_host {
- name: "kvm_sys_tests_kvm_sys",
- defaults: ["crosvm_defaults"],
- crate_name: "kvm_sys",
- srcs: ["src/lib.rs"],
- relative_install_path: "kvm_sys_tests",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- rlibs: [
- "liblibc",
- "libsys_util",
- ],
-}
-
-rust_test_host {
- name: "kvm_sys_tests_sanity",
- defaults: ["crosvm_defaults"],
- crate_name: "sanity",
- srcs: ["tests/sanity.rs"],
- relative_install_path: "kvm_sys_tests",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- rlibs: [
- "libkvm_sys",
- "liblibc",
- "libsys_util",
- ],
-}
+// This file is generated by cargo2android.py.
rust_library_host_rlib {
name: "libkvm_sys",
diff --git a/kvm_sys/TEST_MAPPING b/kvm_sys/TEST_MAPPING
deleted file mode 100644
index f680997..0000000
--- a/kvm_sys/TEST_MAPPING
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "presubmit": [
- {
- "name": "kvm_sys_tests_kvm_sys",
- "host": true
- },
- {
- "name": "kvm_sys_tests_sanity",
- "host": true
- }
- ]
-}
diff --git a/msg_socket/Android.bp b/msg_socket/Android.bp
index cf7feef..68b98e7 100644
--- a/msg_socket/Android.bp
+++ b/msg_socket/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py, added defaults.
+// This file is generated by cargo2android.py.
rust_library_host_rlib {
name: "libmsg_socket",
@@ -13,43 +13,3 @@
"libmsg_on_socket_derive",
],
}
-
-rust_test_host {
- name: "msg_socket_tests",
- defaults: ["crosvm_defaults"],
- crate_name: "msg_socket",
- srcs: [
- "tests/enum.rs",
- "tests/struct.rs",
- "tests/tuple.rs",
- "tests/unit.rs",
- ],
- relative_install_path: "msg_socket_tests",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- rlibs: [
- "libdata_model",
- "libmsg_socket",
- "libsys_util",
- ],
- proc_macros: [
- "libmsg_on_socket_derive",
- ],
-}
-
-rust_test_host {
- name: "msg_socket_tests_msg_socket",
- defaults: ["crosvm_defaults"],
- crate_name: "msg_socket",
- srcs: ["src/lib.rs"],
- relative_install_path: "msg_socket_tests",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- rlibs: [
- "libdata_model",
- "libsys_util",
- ],
- proc_macros: [
- "libmsg_on_socket_derive",
- ],
-}
diff --git a/msg_socket/TEST_MAPPING b/msg_socket/TEST_MAPPING
deleted file mode 100644
index 12a6bf2..0000000
--- a/msg_socket/TEST_MAPPING
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "presubmit": [
- {
- "name": "msg_socket_tests_enum",
- "host": true
- },
- {
- "name": "msg_socket_tests_struct",
- "host": true
- },
- {
- "name": "msg_socket_tests_tuple",
- "host": true
- },
- {
- "name": "msg_socket_tests_unit",
- "host": true
- },
- {
- "name": "msg_socket_tests_msg_socket",
- "host": true
- }
- ]
-}
diff --git a/sys_util/Android.bp b/sys_util/Android.bp
index cba9520..ad97c0b 100644
--- a/sys_util/Android.bp
+++ b/sys_util/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py, manually added "libcap".
+// This file is generated by cargo2android.py.
rust_library_host_rlib {
name: "libsys_util",
@@ -15,5 +15,4 @@
proc_macros: [
"libpoll_token_derive",
],
- shared_libs: ["libcap"], // specified in src/capabilities.rs
}
