diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:41 +0000 |
commit | b397c1f5e2f948e3ceb2ff219384bd9fc3c52e0c (patch) | |
tree | ca9ba939281ce1cdb13491031e734ceb300d9940 | |
parent | a5cd12057c4cb62da89725ed9d356cadc5599443 (diff) | |
parent | 0bb2579b26d29148872f72984a79b3ade28a6bca (diff) | |
download | cesu8-b397c1f5e2f948e3ceb2ff219384bd9fc3c52e0c.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 89913588fe am: 1f68478c36 am: 0bb2579b26
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cesu8/+/1912480
Change-Id: Id1e38e57c79dd1685f28a279b89023f508b23ded
-rw-r--r-- | Android.bp | 21 | ||||
-rw-r--r-- | TEST_MAPPING | 58 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 17 insertions, 64 deletions
@@ -34,29 +34,20 @@ license { ], } -rust_defaults { - name: "cesu8_test_defaults", - crate_name: "cesu8", +rust_test { + name: "cesu8_test_src_lib", // has rustc warnings - srcs: ["src/lib.rs"], + host_supported: true, + crate_name: "cesu8", cargo_env_compat: true, cargo_pkg_version: "1.1.0", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "cesu8_host_test_src_lib", - defaults: ["cesu8_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "cesu8_device_test_src_lib", - defaults: ["cesu8_test_defaults"], + edition: "2015", } rust_library { diff --git a/TEST_MAPPING b/TEST_MAPPING index 9965b4b..2b4350c 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,56 +1,18 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "cesu8_device_test_src_lib" - }, - { - "name": "jni_device_test_src_lib" - }, - { - "name": "jni_device_test_tests_executor" - }, - { - "name": "jni_device_test_tests_executor_nested_attach" - }, - { - "name": "jni_device_test_tests_java_integers" - }, - { - "name": "jni_device_test_tests_jmap" - }, - { - "name": "jni_device_test_tests_jni_api" - }, - { - "name": "jni_device_test_tests_jni_global_refs" - }, + "imports": [ { - "name": "jni_device_test_tests_threads_attach_guard" - }, - { - "name": "jni_device_test_tests_threads_detach" - }, - { - "name": "jni_device_test_tests_threads_detach_daemon" - }, - { - "name": "jni_device_test_tests_threads_explicit_detach" - }, - { - "name": "jni_device_test_tests_threads_explicit_detach_daemon" - }, - { - "name": "jni_device_test_tests_threads_explicit_detach_permanent" - }, - { - "name": "jni_device_test_tests_threads_nested_attach_daemon" - }, + "path": "external/rust/crates/jni" + } + ], + "presubmit": [ { - "name": "jni_device_test_tests_threads_nested_attach_guard" - }, + "name": "cesu8_test_src_lib" + } + ], + "presubmit-rust": [ { - "name": "jni_device_test_tests_threads_nested_attach_permanently" + "name": "cesu8_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json index 728c976..39b0f84 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,7 +4,7 @@ "com.android.uwb" ], "device": true, - "min_sdk_version": "29", + "min-sdk-version": "29", "run": true, "tests": true }
\ No newline at end of file |