diff options
| author | Jakob Vukalovic <jakobvukalovic@google.com> | 2023-05-11 14:22:38 +0000 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-05-11 14:22:38 +0000 |
| commit | e6976e00d3212e4ef490a9aa495f794d85728da9 (patch) | |
| tree | 4e2f811efe227368c58405fdb0dcc3539b591385 | |
| parent | 1b7e8425096ae19628427ac15081b4ec6dc44ab6 (diff) | |
| download | gdbstub-e6976e00d3212e4ef490a9aa495f794d85728da9.tar.gz | |
Use libbitflags-1.3.2
This updates Android.bp to still use the old version of libbitflags instead
of the most recent version. Also add a patch file for Android.bp which
ensures version 1.3.2 is still used after an update.
Test: Build
(cherry picked from https://android-review.googlesource.com/q/commit:7b29e39313571d4c81ec8bd8efbaa34cba4790d3)
Merged-In: Ic8726ee34609c3cc1c1018ec11b58bb8e7b6fdb7
Change-Id: Ic8726ee34609c3cc1c1018ec11b58bb8e7b6fdb7
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 13 |
2 files changed, 14 insertions, 1 deletions
@@ -33,7 +33,7 @@ rust_library { "trace-pkt", ], rustlibs: [ - "libbitflags", + "libbitflags-1.3.2", "libcfg_if", "liblog_rust", "libmanaged", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff new file mode 100644 index 0000000..46edb51 --- /dev/null +++ b/patches/Android.bp.diff @@ -0,0 +1,13 @@ +diff --git a/Android.bp b/Android.bp +index 873b4d1..a241d18 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -33,7 +33,7 @@ rust_library { + "trace-pkt", + ], + rustlibs: [ +- "libbitflags", ++ "libbitflags-1.3.2", + "libcfg_if", + "liblog_rust", + "libmanaged", |