diff options
| author | James Farrell <jamesfarrell@google.com> | 2023-09-14 03:08:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-14 03:08:01 +0000 |
| commit | d4ea6dc5eff392620883d5dd1b059aa0da71baec (patch) | |
| tree | d5ba41b879aa987751cdf244c2a17d967f882718 | |
| parent | fc9082dc7d38727ca953b8bd7d6ae707cbaa30e4 (diff) | |
| parent | a77494792797d10db6ffed58ad237a1af052c678 (diff) | |
| download | nix-d4ea6dc5eff392620883d5dd1b059aa0da71baec.tar.gz | |
Cleanup cargo2android configs and patches am: dab483f7b4 am: 8456e0a468 am: cb9e9791ec am: a774947927
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nix/+/2750927
Change-Id: Ibb05a0ca1b8c62f5a24cc83bbf85398b52d77e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 13 |
2 files changed, 4 insertions, 14 deletions
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" + } } 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", |