aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRavi Jain <raviajain@google.com>2023-05-15 06:50:01 +0000
committerPresubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com>2023-05-15 06:50:01 +0000
commit9e4dcbe6c5476b8a18d28352d16faa987738be54 (patch)
tree31ef90890edd0dbc645612946c5b80e292617987
parent73e5377e09fd165aa6c81fc3a6140588e8aaa6d2 (diff)
parentcf7996958b45884f960c03a2e1473fd3c1b78348 (diff)
downloadgdbstub-9e4dcbe6c5476b8a18d28352d16faa987738be54.tar.gz
[automerge] Revert "Use libbitflags-1.3.2" 2p: cf7996958b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/gdbstub/+/23238037 Change-Id: I0ba5cf760a47a64f4c8a1b06d42e36156e359873
-rw-r--r--Android.bp2
-rw-r--r--patches/Android.bp.diff13
2 files changed, 1 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp
index a241d18..873b4d1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,7 +33,7 @@ rust_library {
"trace-pkt",
],
rustlibs: [
- "libbitflags-1.3.2",
+ "libbitflags",
"libcfg_if",
"liblog_rust",
"libmanaged",
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",