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: I73b92290cc4dd86cee9805d6cc3dae7683afeca1
diff --git a/Android.bp b/Android.bp
index 0ece701..85c5cd5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,7 +56,7 @@
features: ["unstable_boringssl"],
cfgs: ["boringssl", "soong"],
rustlibs: [
- "libbitflags-1.3.2",
+ "libbitflags",
"libcfg_if",
"libbssl_ffi",
"libforeign_types",
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
index ef0ab4f..9f7b012 100644
--- a/patches/Android.bp.diff
+++ b/patches/Android.bp.diff
@@ -1,5 +1,5 @@
diff --git a/Android.bp b/Android.bp
-index 6628b2a..0ece701 100644
+index 2282c66..4e9011c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,11 +54,11 @@ rust_library {
@@ -9,8 +9,7 @@
- cfgs: ["boringssl"],
+ cfgs: ["boringssl", "soong"],
rustlibs: [
-- "libbitflags",
-+ "libbitflags-1.3.2",
+ "libbitflags",
"libcfg_if",
- "libopenssl_sys",
+ "libbssl_ffi",
