diff options
author | Colin Cross <ccross@android.com> | 2019-11-26 13:15:43 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-26 13:15:43 -0800 |
commit | faa3cf3b57952eac82c84dec1da84ce752c070c8 (patch) | |
tree | a4a9aad9e3d6a5445e9abb7ad99ac2864e4f91ee | |
parent | 13232fd37e5033884c6b993951dc0da7eebe7692 (diff) | |
parent | fa311a2f203c430c1b0b0650ccf9b8e44bbf82f3 (diff) | |
download | crosvm-faa3cf3b57952eac82c84dec1da84ce752c070c8.tar.gz |
Revert submission am: 44c5ab22cb
am: fa311a2f20
Change-Id: I55d7fc3acf3cfb3c3480b88649b1b6162dff6081
-rw-r--r-- | bit_field/Android.bp | 34 | ||||
-rw-r--r-- | bit_field/TEST_MAPPING | 16 | ||||
-rw-r--r-- | kvm/Android.bp | 39 | ||||
-rw-r--r-- | kvm/TEST_MAPPING | 20 | ||||
-rw-r--r-- | kvm_sys/Android.bp | 31 | ||||
-rw-r--r-- | kvm_sys/TEST_MAPPING | 12 | ||||
-rw-r--r-- | msg_socket/Android.bp | 42 | ||||
-rw-r--r-- | msg_socket/TEST_MAPPING | 24 | ||||
-rw-r--r-- | sys_util/Android.bp | 3 |
9 files changed, 5 insertions, 216 deletions
diff --git a/bit_field/Android.bp b/bit_field/Android.bp index 35b510cb6..ecf16496d 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 56d157e99..000000000 --- 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 223031694..242ca4dad 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 af23db11a..000000000 --- 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 4614df185..bb7a4f16d 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 f680997b8..000000000 --- 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 cf7feef5b..68b98e7eb 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 @@ rust_library_host_rlib { "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 12a6bf2de..000000000 --- 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 cba95207c..ad97c0bd2 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 @@ rust_library_host_rlib { proc_macros: [ "libpoll_token_derive", ], - shared_libs: ["libcap"], // specified in src/capabilities.rs } |