commit cf7996958b45884f960c03a2e1473fd3c1b78348
author Ravi Jain <raviajain@google.com> Mon May 15 06:49:00 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 15 06:49:43 2023 +0000
tree 31ef90890edd0dbc645612946c5b80e292617987
parent e6976e00d3212e4ef490a9aa495f794d85728da9

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: Id086d6623900046812be683b9f9a827b20cd0711

Android.bp

diff --git a/Android.bp b/Android.bp
index a241d18..873b4d1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,7 +33,7 @@
         "trace-pkt",
     ],
     rustlibs: [
-        "libbitflags-1.3.2",
+        "libbitflags",
         "libcfg_if",
         "liblog_rust",
         "libmanaged",

patches/Android.bp.diff

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",