Snap for 8006021 from b7c27c26a8a2b0d6a40269345b38f16cfa55e416 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: I80ecdb8eb963bc206926a5c1a5e1be8e3e46fa42

3 files changed, 39 insertions, 44 deletions

diff --git a/Android.bp b/Android.bp
index 0bbcd4d..dc3b197 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_webpki_license"],
 }
@@ -37,6 +35,8 @@ rust_library {
     name: "libwebpki",
     host_supported: true,
     crate_name: "webpki",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.22.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -49,12 +49,18 @@ rust_library {
     ],
 }
 
-rust_defaults {
-    name: "webpki_test_defaults",
+rust_test {
+    name: "webpki_test_src_lib",
+    host_supported: true,
     crate_name: "webpki",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.22.0",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "alloc",
@@ -67,22 +73,11 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "webpki_host_test_src_lib",
-    defaults: ["webpki_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "webpki_device_test_src_lib",
-    defaults: ["webpki_test_defaults"],
-}
-
 rust_defaults {
-    name: "webpki_test_defaults_webpki",
+    name: "webpki_test_defaults",
     crate_name: "webpki",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.22.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -98,9 +93,10 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "webpki_host_test_tests_dns_name_tests",
-    defaults: ["webpki_test_defaults_webpki"],
+rust_test {
+    name: "webpki_test_tests_dns_name_tests",
+    defaults: ["webpki_test_defaults"],
+    host_supported: true,
     srcs: ["tests/dns_name_tests.rs"],
     test_options: {
         unit_test: true,
@@ -108,22 +104,11 @@ rust_test_host {
 }
 
 rust_test {
-    name: "webpki_device_test_tests_dns_name_tests",
-    defaults: ["webpki_test_defaults_webpki"],
-    srcs: ["tests/dns_name_tests.rs"],
-}
-
-rust_test_host {
-    name: "webpki_host_test_tests_integration",
-    defaults: ["webpki_test_defaults_webpki"],
+    name: "webpki_test_tests_integration",
+    defaults: ["webpki_test_defaults"],
+    host_supported: true,
     srcs: ["tests/integration.rs"],
     test_options: {
         unit_test: true,
     },
 }
-
-rust_test {
-    name: "webpki_device_test_tests_integration",
-    defaults: ["webpki_test_defaults_webpki"],
-    srcs: ["tests/integration.rs"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index aaa4d17..66818d3 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,13 +2,24 @@
 {
   "presubmit": [
     {
-      "name": "webpki_device_test_src_lib"
+      "name": "webpki_test_src_lib"
     },
     {
-      "name": "webpki_device_test_tests_dns_name_tests"
+      "name": "webpki_test_tests_dns_name_tests"
     },
     {
-      "name": "webpki_device_test_tests_integration"
+      "name": "webpki_test_tests_integration"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "webpki_test_src_lib"
+    },
+    {
+      "name": "webpki_test_tests_dns_name_tests"
+    },
+    {
+      "name": "webpki_test_tests_integration"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 8a00514..b1863fd 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,6 @@
 {
-    "device": true,
-    "features": "alloc,std",
-    "run": true,
-    "tests": true
-}
-
+  "device": true,
+  "features": "alloc,std",
+  "run": true,
+  "tests": true
+}
\ No newline at end of file