commit e28af0befb7c8de39febbd271d3812bbc51aaf90
author Joel Galenson <jgalenson@google.com> Wed Jun 09 16:15:07 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 09 16:15:07 2021 +0000
tree 8b827db17aaa7f0a09cfa7b3794fb02636135350
parent 173e3fec63d5da48dd0fd5710bed050c75e40423
parent 0961189948575082b1d05344de3eeefb52908101

Remove patch by using a new cargo2android.py feature. am: 0961189948

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

Change-Id: I3fe05063c12d5baa7c163f17c0ad5f61ecd4297d

Android.bp

diff --git a/Android.bp b/Android.bp
index b90737f..8a65b0d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --features derive --patch patches/Android.bp.patch.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -45,13 +45,14 @@
     edition: "2018",
     features: [
         "derive",
+        "derive_arbitrary",
     ],
     proc_macros: ["libderive_arbitrary"],
 }
 
 // dependent_library ["feature_list"]
-//   derive_arbitrary-1.0.0
-//   proc-macro2-1.0.26 "default,proc-macro"
+//   derive_arbitrary-1.0.1
+//   proc-macro2-1.0.27 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   syn-1.0.68 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-//   unicode-xid-0.2.1 "default"
+//   syn-1.0.72 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   unicode-xid-0.2.2 "default"

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..af31ee9
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,7 @@
+{
+  "dependencies": true,
+  "device": true,
+  "features": "derive",
+  "force-rlib": true,
+  "run": true
+}
\ No newline at end of file

patches/Android.bp.patch

diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index f6b7c1e..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index fa383fd..7c098db 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -1,6 +1,6 @@
- // This file is generated by cargo2android.py --run --dependencies --device --features derive --patch patches/Android.bp.patch.
- 
--rust_library {
-+rust_library_rlib {
-     name: "libarbitrary",
-     host_supported: true,
-     crate_name: "arbitrary",
-@@ -8,7 +8,6 @@ rust_library {
-     edition: "2018",
-     features: [
-         "derive",
--        "derive_arbitrary",
-     ],
-     proc_macros: ["libderive_arbitrary"],
- }