From 08d8eaeae7bec339c0d5f34f6af8ee78fefd00b1 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 29 Nov 2021 14:05:38 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I9e2e939948fcf8350a28645fce9efe20cef7ae78
---
 Android.bp         | 25 ++++++++-----------------
 TEST_MAPPING       | 23 ++++++++++++-----------
 cargo2android.json |  5 +++++
 3 files changed, 25 insertions(+), 28 deletions(-)
 create mode 100644 cargo2android.json

diff --git a/Android.bp b/Android.bp
index 18ab5e1..850e6fd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -51,14 +51,18 @@ rust_library {
     ],
 }
 
-rust_defaults {
-    name: "tinytemplate_test_defaults",
+rust_test {
+    name: "tinytemplate_test_src_lib",
+    host_supported: true,
     crate_name: "tinytemplate",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "1.2.1",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     rustlibs: [
         "libcriterion",
@@ -67,16 +71,3 @@ rust_defaults {
     ],
     proc_macros: ["libserde_derive"],
 }
-
-rust_test_host {
-    name: "tinytemplate_host_test_src_lib",
-    defaults: ["tinytemplate_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tinytemplate_device_test_src_lib",
-    defaults: ["tinytemplate_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 912694f..9a60ded 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,23 +1,24 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "base64_device_test_tests_decode"
-    },
+  "imports": [
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "tinytemplate_device_test_src_lib"
-    },
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "unicode-xid_device_test_src_lib"
-    },
+      "name": "tinytemplate_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "tinytemplate_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d36fb44
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "device": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file
-- 
cgit v1.2.3