diff options
| author | Jakob Vukalovic <jakobvukalovic@google.com> | 2023-05-19 12:29:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-19 12:29:11 +0000 |
| commit | a52c604b2bcb4ff7f99305a316f37ca6a1a4a533 (patch) | |
| tree | dfcc00c957fa1c2786ecc9860f1d7560954238da | |
| parent | c6040464af7060d5777a040e9f1cf752096d0b20 (diff) | |
| parent | 6bc2449919acfa43f363e8d8ab29cbfb07d45a27 (diff) | |
| download | anes-a52c604b2bcb4ff7f99305a316f37ca6a1a4a533.tar.gz | |
Use libbitflags-1.3.2 am: 1b506f9657 am: 7b672bdac7 am: 6bc2449919
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/anes/+/2563162
Change-Id: If8215463c2feed8e5b3b4130e0606270cf4d94e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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", |