Snap for 8006021 from d862f72e46fdbbf294098fb82ee5a760a3af2dac to tm-release
Change-Id: I840e607ec8271635ce0673daaf0eadd315007fde
diff --git a/Android.bp b/Android.bp
index c9cf3b0..6e0d013 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,30 +37,6 @@
],
}
-rust_defaults {
- name: "jni-sys_test_defaults",
- crate_name: "jni_sys",
- srcs: ["src/lib.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "0.3.0",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2015",
-}
-
-rust_test_host {
- name: "jni-sys_host_test_src_lib",
- defaults: ["jni-sys_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "jni-sys_device_test_src_lib",
- defaults: ["jni-sys_test_defaults"],
-}
-
rust_library {
name: "libjni_sys",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5e21b08..a21e10e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,56 +1,8 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
- "presubmit": [
+ "imports": [
{
- "name": "jni-sys_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"
- },
- {
- "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_device_test_tests_threads_nested_attach_permanently"
+ "path": "external/rust/crates/jni"
}
]
}
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