Snap for 8006021 from 5c282b36b2b28e1ab58755b8e4c1b8dfc49e579a to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi

Change-Id: I368cf680eb45e47d0558357c69addfd7ea48362a

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