diff options
| author | Jakob Vukalovic <jakobvukalovic@google.com> | 2023-05-11 14:22:03 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2023-05-11 14:22:03 +0000 |
| commit | ab03989cd7c8177469efd0ebdef72618a693579a (patch) | |
| tree | dfcc00c957fa1c2786ecc9860f1d7560954238da | |
| parent | e0cecaf43b9da6d6c332b2aedd97fc6723943674 (diff) | |
| parent | 99d10d6c4525693b2e1ebde6e527e9c6ebf27ab4 (diff) | |
| download | anes-ab03989cd7c8177469efd0ebdef72618a693579a.tar.gz | |
[automerge] Use libbitflags-1.3.2 2p: 99d10d6c45
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/anes/+/23150567
Change-Id: Ie4693b397ce7e2b1924229aef4b2da6ac393bc4e
Merged-In: Idbd10a9f755018f01c89ba06d1c8137bfdd5a3e2
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 31 |
2 files changed, 34 insertions, 3 deletions
@@ -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", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff new file mode 100644 index 0000000..72a6503 --- /dev/null +++ b/patches/Android.bp.diff @@ -0,0 +1,31 @@ +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", |