diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:06:49 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:06:49 +0000 |
commit | 8c6ebbd07f71b0e4ee600fb8fb6aa4dd8646a604 (patch) | |
tree | ca9ba939281ce1cdb13491031e734ceb300d9940 | |
parent | 5dd14ff1b8ee7f129a2340e73c3674587476e29a (diff) | |
parent | 9e01c27a0959bb188c699f3e0303c2fe944ee7a9 (diff) | |
download | cesu8-android13-s3-release.tar.gz |
Snap for 8006021 from 9e01c27a0959bb188c699f3e0303c2fe944ee7a9 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: I30fe94572d85c4c3950f46c50b20ba3785281784
-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 |