Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 0b25ed32b6 am: 58a838f39e am: 911599c8d1 am: b9beabe71ct_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_wif_331511020aml_wif_331414000aml_wif_331310070aml_wif_331112000aml_wif_331016070aml_wif_330910030aml_wif_330810040aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_tet_331511160aml_tet_331511000aml_tet_331412030aml_tet_331312080aml_tet_331117000aml_tet_331012080aml_tet_330911010aml_tet_330812150aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000aml_sdk_331811100aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010aml_sch_331113000aml_sch_331111000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030aml_neu_331310000aml_neu_331113000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020aml_med_331511000aml_med_331410000aml_med_331318000aml_med_331115000aml_med_331012020aml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ext_331814220aml_ext_331412000aml_ext_331312000aml_ext_331112010aml_ext_331012020aml_doc_331120000aml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_331511020aml_ads_331418080aml_ads_331131000aml_adb_331314020aml_adb_331113120aml_adb_331011050aml_adb_331011040android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-ipsec-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-extservices-releaseandroid13-mainline-conscrypt-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adbd-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-release

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

Change-Id: I42fbd4511ed7a3150ba0f3acd12d236ec2f821f0

3 files changed, 11 insertions, 335 deletions

diff --git a/Android.bp b/Android.bp
index e2d0b27..e397f6e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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