From bd87b64fbfd1f4f0e681096514a89167a393d8c4 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Thu, 28 Oct 2021 15:17:12 -0700 Subject: Add apex_available. The test changes are side effects due to rerunning cargo2android.py. Test: None Change-Id: Ib5c3668115bab6117334b8135f2ea5d69b3f976a --- Android.bp | 87 +++++++++++++----------------------------------------- cargo2android.json | 1 + 2 files changed, 22 insertions(+), 66 deletions(-) diff --git a/Android.bp b/Android.bp index 1217d33..08266c5 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"], @@ -69,7 +38,7 @@ rust_defaults { rust_test_host { name: "bytes_host_test_tests_test_buf", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_buf.rs"], test_options: { unit_test: true, @@ -78,13 +47,13 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_buf", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_buf.rs"], } rust_test_host { name: "bytes_host_test_tests_test_buf_mut", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_buf_mut.rs"], test_options: { unit_test: true, @@ -93,13 +62,13 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_buf_mut", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_buf_mut.rs"], } rust_test_host { name: "bytes_host_test_tests_test_bytes", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_bytes.rs"], test_options: { unit_test: true, @@ -108,13 +77,13 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_bytes", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_bytes.rs"], } rust_test_host { name: "bytes_host_test_tests_test_bytes_odd_alloc", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_bytes_odd_alloc.rs"], test_options: { unit_test: true, @@ -123,13 +92,13 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_bytes_odd_alloc", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_bytes_odd_alloc.rs"], } rust_test_host { name: "bytes_host_test_tests_test_bytes_vec_alloc", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_bytes_vec_alloc.rs"], test_options: { unit_test: true, @@ -138,13 +107,13 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_bytes_vec_alloc", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_bytes_vec_alloc.rs"], } rust_test_host { name: "bytes_host_test_tests_test_chain", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_chain.rs"], test_options: { unit_test: true, @@ -153,13 +122,13 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_chain", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_chain.rs"], } rust_test_host { name: "bytes_host_test_tests_test_debug", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_debug.rs"], test_options: { unit_test: true, @@ -168,13 +137,13 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_debug", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_debug.rs"], } rust_test_host { name: "bytes_host_test_tests_test_iter", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_iter.rs"], test_options: { unit_test: true, @@ -183,13 +152,13 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_iter", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_iter.rs"], } rust_test_host { name: "bytes_host_test_tests_test_reader", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_reader.rs"], test_options: { unit_test: true, @@ -198,28 +167,13 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_reader", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], 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"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_take.rs"], test_options: { unit_test: true, @@ -228,7 +182,7 @@ rust_test_host { rust_test { name: "bytes_device_test_tests_test_take", - defaults: ["bytes_test_defaults_bytes"], + defaults: ["bytes_test_defaults"], srcs: ["tests/test_take.rs"], } @@ -247,6 +201,7 @@ rust_library { apex_available: [ "//apex_available:platform", "com.android.resolv", + "com.android.uwb", "com.android.virt", ], min_sdk_version: "29", diff --git a/cargo2android.json b/cargo2android.json index f72af5e..25aec93 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -2,6 +2,7 @@ "apex-available": [ "//apex_available:platform", "com.android.resolv", + "com.android.uwb", "com.android.virt" ], "min_sdk_version": "29", -- cgit v1.2.3