Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 7754bf823d am: d4da537e47 am: b42acfd568

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/gdbstub/+/1912523

Change-Id: Iea74c87b5658d0aff5075aebb64d1a4c71e91b08

Android.bp

diff --git a/Android.bp b/Android.bp
index b9af58b..6155ca7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --no-subdir.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -22,6 +22,8 @@
     name: "libgdbstub",
     host_supported: true,
     crate_name: "gdbstub",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.5.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -37,12 +39,3 @@
     ],
     proc_macros: ["libpaste"],
 }
-
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   cfg-if-0.1.10
-//   cfg-if-1.0.0
-//   log-0.4.14 "std"
-//   managed-0.8.0 "alloc"
-//   num-traits-0.2.14
-//   paste-1.0.5

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 1e91e7e..c09ff4c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,8 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "gdbstub_arch_device_test_src_lib"
+      "path": "external/rust/crates/gdbstub_arch"
     }
   ]
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..84da6ae
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "device": true,
+  "no-subdir": true,
+  "run": true
+}
\ No newline at end of file