diff options
| author | Ravi Jain <raviajain@google.com> | 2023-05-15 06:49:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-05-15 06:50:29 +0000 |
| commit | 967289a65493fec01f59bf27cd51a9e53439faa6 (patch) | |
| tree | 1f98d45f422d440fb1791dfe8d851584991415eb | |
| parent | 62a90b19ab749d3d3e0998c28378f4711d89ea68 (diff) | |
| download | userfaultfd-967289a65493fec01f59bf27cd51a9e53439faa6.tar.gz | |
Revert "[automerge] Use libbitflags-1.3.2 2p: 8361c9988d"
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: I1cdb68ec1afc69b1c802f4c58d4695c36255592f
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 13 |
2 files changed, 1 insertions, 14 deletions
@@ -34,7 +34,7 @@ rust_library { edition: "2018", features: ["default"], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libcfg_if", "liblibc", "libnix", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index d7c81bc..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 69d9cb2..02cdcf2 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -47,7 +47,7 @@ rust_library { - edition: "2018", - features: ["default"], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - "libcfg_if", - "liblibc", - "libnix", |