diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:47 +0000 |
commit | 911599c8d12b994772748ceff7a0676d045af101 (patch) | |
tree | a0ef91489e228a89341d03b6b4d349e8f4c66867 | |
parent | 3dc7249b534160894eb9ff654370e6de8d810b1a (diff) | |
parent | 58a838f39eb218a3652c2114f807d4366aa982a9 (diff) | |
download | jni-911599c8d12b994772748ceff7a0676d045af101.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 0b25ed32b6 am: 58a838f39e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/jni/+/1912677
Change-Id: I621360c34bd21ab2ad389fb8c513bb69b151e658
-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 |