Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."

3 files changed, 12 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index 6dc214d..da4300e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// 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_kernlog_license"],
 }
@@ -25,6 +23,8 @@ rust_library {
     // has rustc warnings
     host_supported: true,
     crate_name: "kernlog",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -32,8 +32,3 @@ rust_library {
         "liblog_rust",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   cfg-if-1.0.0
-//   libc-0.2.97 "default,std"
-//   log-0.4.14 "std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index a6f2d7b..fde50cb 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -4,5 +4,10 @@
     {
       "name": "microdroid_manager_test"
     }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "microdroid_manager_test"
+    }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..bf78496
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+  "device": true,
+  "run": true
+}
\ No newline at end of file