aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-05-11 14:23:02 +0000
committerPresubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com>2023-05-11 14:23:02 +0000
commit73e5377e09fd165aa6c81fc3a6140588e8aaa6d2 (patch)
tree4e2f811efe227368c58405fdb0dcc3539b591385
parentece0cde17a12ce1be03b810f70eda2d124846ffd (diff)
parente6976e00d3212e4ef490a9aa495f794d85728da9 (diff)
downloadgdbstub-73e5377e09fd165aa6c81fc3a6140588e8aaa6d2.tar.gz
[automerge] Use libbitflags-1.3.2 2p: e6976e00d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/gdbstub/+/23169389 Change-Id: Idf9faa01ce293d685985095a67c78bfe872d7bb0 Merged-In: Ic8726ee34609c3cc1c1018ec11b58bb8e7b6fdb7
-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",