diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:08 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:08 +0000 |
commit | c5a6606059aca3ddf86503e293340481572365fe (patch) | |
tree | a0ef91489e228a89341d03b6b4d349e8f4c66867 | |
parent | fb156efedf6a0409d52f9d3c45818ff901a10fda (diff) | |
parent | ff9d1c5e44fa55a18b0e5bec12529e8558d4f40c (diff) | |
download | jni-android13-gsi.tar.gz |
Snap for 8006021 from ff9d1c5e44fa55a18b0e5bec12529e8558d4f40c 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: I63a51f7704bea1241d3f39699ffda15472bbc865
-rw-r--r-- | Android.bp | 294 | ||||
-rw-r--r-- | TEST_MAPPING | 50 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 11 insertions, 335 deletions
@@ -37,53 +37,24 @@ license { ], } -rust_defaults { - name: "jni_test_defaults", - crate_name: "jni", +rust_test { + name: "jni_test_src_lib", // has rustc warnings - srcs: ["src/lib.rs"], + host_supported: true, + crate_name: "jni", cargo_env_compat: true, cargo_pkg_version: "0.19.0", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2018", - features: ["default"], - rustlibs: [ - "libcesu8", - "libcombine", - "libjni_sys", - "liblazy_static", - "liblog_rust", - "libthiserror", - ], -} - -rust_test_host { - name: "jni_host_test_src_lib", - defaults: ["jni_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "jni_device_test_src_lib", - defaults: ["jni_test_defaults"], -} - -rust_defaults { - name: "jni_test_defaults_jni", - crate_name: "jni", - cargo_env_compat: true, - cargo_pkg_version: "0.19.0", - test_suites: ["general-tests"], - auto_gen_config: true, edition: "2018", features: ["default"], rustlibs: [ "libcesu8", "libcombine", - "libjni", "libjni_sys", "liblazy_static", "liblog_rust", @@ -91,261 +62,6 @@ rust_defaults { ], } -rust_test_host { - name: "jni_host_test_tests_executor", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/executor.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_executor", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/executor.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_executor_nested_attach", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/executor_nested_attach.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_executor_nested_attach", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/executor_nested_attach.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_java_integers", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/java_integers.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_java_integers", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/java_integers.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_jmap", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/jmap.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_jmap", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/jmap.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_jni_api", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/jni_api.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_jni_api", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/jni_api.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_jni_global_refs", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/jni_global_refs.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_jni_global_refs", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/jni_global_refs.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_threads_attach_guard", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_attach_guard.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_threads_attach_guard", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_attach_guard.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_threads_detach", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_detach.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_threads_detach", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_detach.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_threads_detach_daemon", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_detach_daemon.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_threads_detach_daemon", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_detach_daemon.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_threads_explicit_detach", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_explicit_detach.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_threads_explicit_detach", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_explicit_detach.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_threads_explicit_detach_daemon", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_explicit_detach_daemon.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_threads_explicit_detach_daemon", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_explicit_detach_daemon.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_threads_explicit_detach_permanent", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_explicit_detach_permanent.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_threads_explicit_detach_permanent", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_explicit_detach_permanent.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_threads_nested_attach_daemon", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_nested_attach_daemon.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_threads_nested_attach_daemon", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_nested_attach_daemon.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_threads_nested_attach_guard", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_nested_attach_guard.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_threads_nested_attach_guard", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_nested_attach_guard.rs"], -} - -rust_test_host { - name: "jni_host_test_tests_threads_nested_attach_permanently", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_nested_attach_permanently.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni_device_test_tests_threads_nested_attach_permanently", - defaults: ["jni_test_defaults_jni"], - // has rustc warnings - srcs: ["tests/threads_nested_attach_permanently.rs"], -} - rust_library { name: "libjni", // has rustc warnings diff --git a/TEST_MAPPING b/TEST_MAPPING index 89d071b..78d12e3 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,52 +2,12 @@ { "presubmit": [ { - "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" - }, - { - "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" - }, - { - "name": "jni_device_test_tests_threads_nested_attach_guard" - }, + "name": "jni_test_src_lib" + } + ], + "presubmit-rust": [ { - "name": "jni_device_test_tests_threads_nested_attach_permanently" + "name": "jni_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 |