Revert "Use libbitflags-1.3.2"
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: Ibc14174a412339c4c886fd4181a5385df8478635
diff --git a/Android.bp b/Android.bp
index 36ba6ab..a20fffb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,7 +57,7 @@
"parser",
],
rustlibs: [
- "libbitflags-1.3.2",
+ "libbitflags",
"libcriterion",
"liblibc",
],
@@ -82,7 +82,7 @@
],
rustlibs: [
"libanes",
- "libbitflags-1.3.2",
+ "libbitflags",
"libcriterion",
"liblibc",
],
@@ -101,7 +101,7 @@
"parser",
],
rustlibs: [
- "libbitflags-1.3.2",
+ "libbitflags",
],
apex_available: [
"//apex_available:platform",
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
deleted file mode 100644
index 72a6503..0000000
--- a/patches/Android.bp.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index a20fffb..36ba6ab 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -57,7 +57,7 @@ rust_test {
- "parser",
- ],
- rustlibs: [
-- "libbitflags",
-+ "libbitflags-1.3.2",
- "libcriterion",
- "liblibc",
- ],
-@@ -82,7 +82,7 @@ rust_test {
- ],
- rustlibs: [
- "libanes",
-- "libbitflags",
-+ "libbitflags-1.3.2",
- "libcriterion",
- "liblibc",
- ],
-@@ -101,7 +101,7 @@ rust_library {
- "parser",
- ],
- rustlibs: [
-- "libbitflags",
-+ "libbitflags-1.3.2",
- ],
- apex_available: [
- "//apex_available:platform",
