diff options
author | James Farrell <jamesfarrell@google.com> | 2023-09-14 04:12:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-14 04:12:58 +0000 |
commit | ef89dc37bd20fe0d5a003d464b8a034408fb5e1f (patch) | |
tree | b461f96f118c664baf02c2d32cedbd6a9f006848 | |
parent | 33cabdfa3e5c30aafd3f245668375b5cb6957be3 (diff) | |
parent | 5600a220eeed6492460eaa8b03d7aec677ed6695 (diff) | |
download | gdbstub-ef89dc37bd20fe0d5a003d464b8a034408fb5e1f.tar.gz |
Cleanup cargo2android configs and patches am: 2630d6857a am: b3da39b5b5 am: 17f809d4b3 am: f8bb628cac am: 5600a220ee
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/gdbstub/+/2751003
Change-Id: Ic3e2d550ce5d81dfa195e1d5787224d0ae44c89b
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", |