diff options
| author | Ravi Jain <raviajain@google.com> | 2023-05-15 06:50:12 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2023-05-15 06:50:12 +0000 |
| commit | 185786b853cdd850bd6bcce1b1104c4d7a135a75 (patch) | |
| tree | 72b2ef9bb84a3ddc94817ff35e5bf57ff1355a0d | |
| parent | ab03989cd7c8177469efd0ebdef72618a693579a (diff) | |
| parent | 9a68e40bc75ad6188064a41ae1d7d145bc754fd0 (diff) | |
| download | anes-185786b853cdd850bd6bcce1b1104c4d7a135a75.tar.gz | |
[automerge] Revert "Use libbitflags-1.3.2" 2p: 9a68e40bc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/anes/+/23238040
Change-Id: Id3f7e8638d9d2a29ac0cf19b4c288dca80c2c13e
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 31 |
2 files changed, 3 insertions, 34 deletions
@@ -57,7 +57,7 @@ rust_test { "parser", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libcriterion", "liblibc", ], @@ -82,7 +82,7 @@ rust_test { ], rustlibs: [ "libanes", - "libbitflags-1.3.2", + "libbitflags", "libcriterion", "liblibc", ], @@ -101,7 +101,7 @@ rust_library { "parser", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", ], apex_available: [ "//apex_available:platform", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 72a6503..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index a20fffb..36ba6ab 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -57,7 +57,7 @@ rust_test { - "parser", - ], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - "libcriterion", - "liblibc", - ], -@@ -82,7 +82,7 @@ rust_test { - ], - rustlibs: [ - "libanes", -- "libbitflags", -+ "libbitflags-1.3.2", - "libcriterion", - "liblibc", - ], -@@ -101,7 +101,7 @@ rust_library { - "parser", - ], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - ], - apex_available: [ - "//apex_available:platform", |