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:49:00 +0000 |
| commit | dec38d0a7685371d5fd21f5b77d777b5bdfd3895 (patch) | |
| tree | 3d2e66dd60d36a1778a2c84ed94a2021e4dbad30 | |
| parent | d70d4f481dc6b85e0073f1312132448a05c45187 (diff) | |
| download | nix-dec38d0a7685371d5fd21f5b77d777b5bdfd3895.tar.gz | |
Revert "[automerge] Use libbitflags-1.3.2 2p: 6a4e5bc5b7"
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: I802ec88914c4e33fae814dcf08008869e328cf3c
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 13 |
2 files changed, 1 insertions, 14 deletions
@@ -67,7 +67,7 @@ rust_library { "zerocopy", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libcfg_if", "liblibc", "libmemoffset", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index c7025be..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index f471209..f44d482 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -67,7 +67,7 @@ rust_library { - "zerocopy", - ], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - "libcfg_if", - "liblibc", - "libmemoffset", |