Use released proc-macro2-1.0.4 at crates.io

* Auto generated Android.bp from cargo2android.py.
* Release package is different from git source repository:
  * .cargo_vcs_info.json has the snapshot commit sha.
  * Cleaned up Cargo.toml, with original version saved.

Test: build all rust modules
Change-Id: I45965bbf9a6a9ec6ee993fbb69f771c23b307896

1 files changed, 10 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 7c4f5d0..3c69ffd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,16 +1,21 @@
+// This file is generated by cargo2android.py.
+
 rust_library_rlib {
     name: "libproc_macro2",
     host_supported: true,
     crate_name: "proc_macro2",
     srcs: ["src/lib.rs"],
-    rlibs: ["libunicode_xid"],
+    edition: "2018",
+    features: [
+        "default",
+        "proc-macro",
+    ],
     flags: [
+        "--cfg proc_macro_span",
         "--cfg use_proc_macro",
         "--cfg wrap_proc_macro",
     ],
-    features: [
-        "default",
-        "proc-macro",
+    rlibs: [
+        "libunicode_xid",
     ],
-    edition: "2018",
 }