aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRavi Jain <raviajain@google.com>2023-05-15 06:49:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-05-15 06:49:47 +0000
commite51301a98b0ade431051bf9bc535d865e8bea50c (patch)
tree31ef90890edd0dbc645612946c5b80e292617987
parent73e5377e09fd165aa6c81fc3a6140588e8aaa6d2 (diff)
downloadgdbstub-e51301a98b0ade431051bf9bc535d865e8bea50c.tar.gz
Revert "[automerge] Use libbitflags-1.3.2 2p: e6976e00d3"
Revert submission 23170841-cherrypicker-L56400000960600321:N14500001367781407 Reason for revert: DroidMonitor: Potential culprit for Bug b/282265637 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:23170841-cherrypicker-L56400000960600321:N14500001367781407 Change-Id: I530d29e709667427480268af15d4db4304aa1da4
-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",