diff options
author | James Farrell <jamesfarrell@google.com> | 2023-09-14 01:38:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-14 01:38:05 +0000 |
commit | 17f809d4b3c221347fa625e13da84731ce216554 (patch) | |
tree | b461f96f118c664baf02c2d32cedbd6a9f006848 | |
parent | 6e8ee0db6855ba14a11b3f4a142e66ffef80ba28 (diff) | |
parent | b3da39b5b5c63c7a08e210a2fc226020a69c5920 (diff) | |
download | gdbstub-17f809d4b3c221347fa625e13da84731ce216554.tar.gz |
Cleanup cargo2android configs and patches am: 2630d6857a am: b3da39b5b5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/gdbstub/+/2751003
Change-Id: I94fdbc7698e3561f037f6c3159d1f75d7a51ab32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | cargo2android.json | 7 | ||||
-rw-r--r-- | patches/Android.bp.diff | 13 |
2 files changed, 5 insertions, 15 deletions
diff --git a/cargo2android.json b/cargo2android.json index 84da6ae..5e354da 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,5 +1,8 @@ { "device": true, "no-subdir": true, - "run": true -}
\ No newline at end of file + "run": true, + "dep-suffixes": { + "bitflags": "-1.3.2" + } +} diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 46edb51..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 873b4d1..a241d18 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -33,7 +33,7 @@ rust_library { - "trace-pkt", - ], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - "libcfg_if", - "liblog_rust", - "libmanaged", |