Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

3 files changed, 20 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index ecc8ca0..8aa890f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features=std,clock.
+// 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_chrono_license"],
@@ -34,6 +35,8 @@ rust_library {
     name: "libchrono",
     host_supported: true,
     crate_name: "chrono",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.4.19",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
@@ -48,9 +51,3 @@ rust_library {
         "libnum_traits",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   libc-0.2.85 "default,std"
-//   num-integer-0.1.44
-//   num-traits-0.2.14 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 525e195..08b3cb2 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -10,5 +10,16 @@
     {
       "name": "microdroid_manager_test"
     }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..b012d15
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "device": true,
+  "features": "std,clock",
+  "run": true
+}
\ No newline at end of file