From 2901ba95e3a5eb76845b5a48bc439f6a1e2adc34 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 29 Nov 2021 14:03:13 -0800 Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING. Test: None Change-Id: Icaae14464070d095be9bbbba53ca09b16b6d46f6 --- Android.bp | 156 ++++++++++++------------------------------------------------- 1 file changed, 30 insertions(+), 126 deletions(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 7000e0e..b723165 100644 --- a/Android.bp +++ b/Android.bp @@ -21,37 +21,6 @@ license { rust_defaults { name: "bytes_test_defaults", crate_name: "bytes", - srcs: ["src/lib.rs"], - cargo_env_compat: true, - cargo_pkg_version: "1.1.0", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - features: [ - "default", - "std", - ], - rustlibs: [ - "libserde_test", - ], -} - -rust_test_host { - name: "bytes_host_test_src_lib", - defaults: ["bytes_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "bytes_device_test_src_lib", - defaults: ["bytes_test_defaults"], -} - -rust_defaults { - name: "bytes_test_defaults_bytes", - crate_name: "bytes", cargo_env_compat: true, cargo_pkg_version: "1.1.0", test_suites: ["general-tests"], @@ -67,171 +36,106 @@ rust_defaults { ], } -rust_test_host { - name: "bytes_host_test_tests_test_buf", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_buf.rs"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "bytes_device_test_tests_test_buf", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_buf", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_buf.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_buf_mut", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_buf_mut.rs"], test_options: { unit_test: true, }, } rust_test { - name: "bytes_device_test_tests_test_buf_mut", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_buf_mut", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_buf_mut.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_bytes", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_bytes.rs"], test_options: { unit_test: true, }, } rust_test { - name: "bytes_device_test_tests_test_bytes", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_bytes", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_bytes.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_bytes_odd_alloc", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_bytes_odd_alloc.rs"], test_options: { unit_test: true, }, } rust_test { - name: "bytes_device_test_tests_test_bytes_odd_alloc", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_bytes_odd_alloc", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_bytes_odd_alloc.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_bytes_vec_alloc", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_bytes_vec_alloc.rs"], test_options: { unit_test: true, }, } rust_test { - name: "bytes_device_test_tests_test_bytes_vec_alloc", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_bytes_vec_alloc", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_bytes_vec_alloc.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_chain", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_chain.rs"], test_options: { unit_test: true, }, } rust_test { - name: "bytes_device_test_tests_test_chain", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_chain", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_chain.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_debug", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_debug.rs"], test_options: { unit_test: true, }, } rust_test { - name: "bytes_device_test_tests_test_debug", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_debug", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_debug.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_iter", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_iter.rs"], test_options: { unit_test: true, }, } rust_test { - name: "bytes_device_test_tests_test_iter", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_iter", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_iter.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_reader", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_reader.rs"], test_options: { unit_test: true, }, } rust_test { - name: "bytes_device_test_tests_test_reader", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_reader", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_reader.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_serde", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_serde.rs"], test_options: { unit_test: true, }, } rust_test { - name: "bytes_device_test_tests_test_serde", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_serde.rs"], -} - -rust_test_host { - name: "bytes_host_test_tests_test_take", - defaults: ["bytes_test_defaults_bytes"], + name: "bytes_test_tests_test_take", + defaults: ["bytes_test_defaults"], + host_supported: true, srcs: ["tests/test_take.rs"], test_options: { unit_test: true, }, } -rust_test { - name: "bytes_device_test_tests_test_take", - defaults: ["bytes_test_defaults_bytes"], - srcs: ["tests/test_take.rs"], -} - rust_library { name: "libbytes", host_supported: true, -- cgit v1.2.3