diff options
| author | Jakob Vukalovic <jakobvukalovic@google.com> | 2023-05-11 14:21:57 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2023-05-11 14:21:57 +0000 |
| commit | 24518de485f42c82f86b80407865cc89d66dd409 (patch) | |
| tree | 408168a82ac7c26b5f4d6db75788ad8ae6e15b48 | |
| parent | 2a81c18886169ee92d271efec3627c9661222719 (diff) | |
| parent | 6202b24dc2202ad28aca8b5ddee8fcf4f32ec103 (diff) | |
| download | aarch64-paging-24518de485f42c82f86b80407865cc89d66dd409.tar.gz | |
[automerge] Use libbitflags-1.3.2 2p: 6202b24dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/aarch64-paging/+/23170919
Change-Id: I366c1dd01a5f29f3d17641d8c51f2c8689069cd7
Merged-In: I4f51dd6919c890041dbc7898f261904db416c61f
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 22 |
2 files changed, 24 insertions, 2 deletions
@@ -58,7 +58,7 @@ rust_test { "default", ], rustlibs: [ - "libbitflags", + "libbitflags-1.3.2", ], enabled: false, arch: { @@ -81,7 +81,7 @@ rust_library { "default", ], 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..28fe389 --- /dev/null +++ b/patches/Android.bp.diff @@ -0,0 +1,22 @@ +diff --git a/Android.bp b/Android.bp +index 9a97e6d..7ffbbb9 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -58,7 +58,7 @@ rust_test { + "default", + ], + rustlibs: [ +- "libbitflags", ++ "libbitflags-1.3.2", + ], + enabled: false, + arch: { +@@ -81,7 +81,7 @@ rust_library { + "default", + ], + rustlibs: [ +- "libbitflags", ++ "libbitflags-1.3.2", + ], + apex_available: [ + "//apex_available:platform", |