aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-05-19 12:29:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-19 12:29:09 +0000
commit6e8ee0db6855ba14a11b3f4a142e66ffef80ba28 (patch)
tree4e2f811efe227368c58405fdb0dcc3539b591385
parentdcbceead25109040afac0080690ac2677e77ea57 (diff)
parentdaefb768a08749b291f02fa51d2a29a86f69d492 (diff)
downloadgdbstub-6e8ee0db6855ba14a11b3f4a142e66ffef80ba28.tar.gz
Use libbitflags-1.3.2 am: c1f404feb5 am: 4a42beab07 am: daefb768a0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/gdbstub/+/2563163 Change-Id: I93498195a8cdc1d5833c22e3df3b98b631cd2b6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--patches/Android.bp.diff13
2 files changed, 14 insertions, 1 deletions
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",
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..46edb51
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+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",