commit 8456e0a468e085b6bf19169a4d49629d23baf231
author James Farrell <jamesfarrell@google.com> Thu Sep 14 00:41:28 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 14 00:41:28 2023 +0000
tree d5ba41b879aa987751cdf244c2a17d967f882718
parent 04ada78479f5a2465cb684cfff1a8a72255864b0
parent dab483f7b426e949f495dad51578fd7911acc664

Cleanup cargo2android configs and patches am: dab483f7b4

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

Change-Id: I623f63cf35efed6dfde66fe305227ab70a9ab7b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index ef4e5f8..1bd5b8b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,5 +3,8 @@
   "device": true,
   "min-sdk-version": "29",
   "run": true,
-  "vendor-available": true
+  "vendor-available": true,
+  "dep-suffixes": {
+    "bitflags": "-1.3.2"
+  }
 }

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
deleted file mode 100644
index c7025be..0000000
--- a/patches/Android.bp.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index f471209..f44d482 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -67,7 +67,7 @@ rust_library {
-         "zerocopy",
-     ],
-     rustlibs: [
--        "libbitflags",
-+        "libbitflags-1.3.2",
-         "libcfg_if",
-         "liblibc",
-         "libmemoffset",