Revert "[automerge] Use libbitflags-1.3.2 2p: 8119d54bfd"
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: I6304cc5ad91d25a53779f314625caaf44c2df0c8
diff --git a/Android.bp b/Android.bp
index 9de5ea6..c0ca574 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,7 +31,7 @@
"trace",
],
rustlibs: [
- "libbitflags-1.3.2",
+ "libbitflags",
"libfallible_iterator",
"libfallible_streaming_iterator",
"libhashlink",
@@ -56,7 +56,7 @@
"trace",
],
rustlibs: [
- "libbitflags-1.3.2",
+ "libbitflags",
"libfallible_iterator",
"libfallible_streaming_iterator",
"libhashlink",
diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp
index e0c0fcf..33222cb 100644
--- a/cargo2android-extra-module.bp
+++ b/cargo2android-extra-module.bp
@@ -10,7 +10,7 @@
"trace",
],
rustlibs: [
- "libbitflags-1.3.2",
+ "libbitflags",
"libfallible_iterator",
"libfallible_streaming_iterator",
"libhashlink",
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
deleted file mode 100644
index 53b87f1..0000000
--- a/patches/Android.bp.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index c0ca574..9de5ea6 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -31,7 +31,7 @@ rust_library {
- "trace",
- ],
- rustlibs: [
-- "libbitflags",
-+ "libbitflags-1.3.2",
- "libfallible_iterator",
- "libfallible_streaming_iterator",
- "libhashlink",
-@@ -56,7 +56,7 @@ rust_library {
- "trace",
- ],
- rustlibs: [
-- "libbitflags",
-+ "libbitflags-1.3.2",
- "libfallible_iterator",
- "libfallible_streaming_iterator",
- "libhashlink",
