Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: cded7e2bce am: 88a5c05d7e am: 99b119a02c am: 9af92ad78ft_frc_odp_330442040t_frc_odp_330442000t_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_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_331113000aml_sch_331111000aml_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_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-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-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-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-frc-odp-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/base64/+/1912045

Change-Id: Iface4a1ae2c24cef0fb8de3902afd451fe9a3bfe

3 files changed, 45 insertions, 55 deletions

diff --git a/Android.bp b/Android.bp
index b987e93..051dcae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
 // 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_base64_license"],
 }
@@ -40,8 +38,10 @@ license {
 }
 
 rust_defaults {
-    name: "base64_defaults",
+    name: "base64_test_defaults",
     crate_name: "base64",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.13.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -57,56 +57,33 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "base64_host_test_tests_decode",
-    defaults: ["base64_defaults"],
-    srcs: ["tests/decode.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
-    name: "base64_device_test_tests_decode",
-    defaults: ["base64_defaults"],
+    name: "base64_test_tests_decode",
+    defaults: ["base64_test_defaults"],
+    host_supported: true,
     srcs: ["tests/decode.rs"],
-}
-
-rust_test_host {
-    name: "base64_host_test_tests_encode",
-    defaults: ["base64_defaults"],
-    srcs: ["tests/encode.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "base64_device_test_tests_encode",
-    defaults: ["base64_defaults"],
+    name: "base64_test_tests_encode",
+    defaults: ["base64_test_defaults"],
+    host_supported: true,
     srcs: ["tests/encode.rs"],
-}
-
-rust_test_host {
-    name: "base64_host_test_tests_helpers",
-    defaults: ["base64_defaults"],
-    srcs: ["tests/helpers.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
-rust_test {
-    name: "base64_device_test_tests_helpers",
-    defaults: ["base64_defaults"],
-    srcs: ["tests/helpers.rs"],
-}
-
 rust_library {
     name: "libbase64_rust",
     stem: "libbase64",
     host_supported: true,
     crate_name: "base64",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.13.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5b7b1a1..de2964d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,14 +1,16 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "base64_device_test_tests_decode"
-    },
+      "path": "external/rust/crates/webpki"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "base64_device_test_tests_encode"
+      "name": "base64_test_tests_decode"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "name": "base64_test_tests_encode"
     },
     {
       "name": "doh_unit_test"
@@ -21,15 +23,26 @@
     },
     {
       "name": "microdroid_manager_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "base64_test_tests_decode"
+    },
+    {
+      "name": "base64_test_tests_encode"
     },
     {
-      "name": "webpki_device_test_src_lib"
+      "name": "doh_unit_test"
     },
     {
-      "name": "webpki_device_test_tests_dns_name_tests"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "webpki_device_test_tests_integration"
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 6c4525a..d2d1ca1 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,14 +1,14 @@
 {
-    "apex-available": [
-      "//apex_available:platform",
-      "com.android.resolv"
-    ],
-    "min_sdk_version": "29",
-    "device": true,
-    "run": true,
-    "test-blocklist": [
-      "src/lib.rs",
-      "tests/tests.rs"
-    ],
-    "tests": true
-  }
\ No newline at end of file
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "device": true,
+  "min-sdk-version": "29",
+  "run": true,
+  "test-blocklist": [
+    "src/lib.rs",
+    "tests/tests.rs"
+  ],
+  "tests": true
+}
\ No newline at end of file