Add apex_available. am: 0883cbb181 am: 6fdf67611e

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/jni/+/1874230

Change-Id: I37cce51657e4a1f2e87555ec95bfbd46a3b0f2db

2 files changed, 18 insertions, 276 deletions

diff --git a/Android.bp b/Android.bp
index bb2eb0c..12c748d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// This file is generated by cargo2android.py --run --device --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
-
-
 package {
     default_applicable_licenses: ["external_rust_crates_jni_license"],
 }
@@ -44,6 +42,8 @@ rust_defaults {
     crate_name: "jni",
     // has rustc warnings
     srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.19.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -71,279 +71,6 @@ rust_test {
     defaults: ["jni_test_defaults"],
 }
 
-rust_defaults {
-    name: "jni_test_defaults_jni",
-    crate_name: "jni",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    features: ["default"],
-    rustlibs: [
-        "libcesu8",
-        "libcombine",
-        "libjni",
-        "libjni_sys",
-        "liblazy_static",
-        "liblog_rust",
-        "libthiserror",
-    ],
-}
-
-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
@@ -361,4 +88,9 @@ rust_library {
         "liblog_rust",
         "libthiserror",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.uwb",
+    ],
+    min_sdk_version: "29",
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..728c976
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.uwb"
+  ],
+  "device": true,
+  "min_sdk_version": "29",
+  "run": true,
+  "tests": true
+}
\ No newline at end of file