aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-04-26 16:00:00 +0100
committerJakob Vukalović <jakobvukalovic@google.com>2023-05-18 17:41:59 +0000
commitc1f404feb5629afb9638750facb8d4efde27917e (patch)
tree4e2f811efe227368c58405fdb0dcc3539b591385
parente5b6f5e767220bac0a601e9ee024b4fff7851d8a (diff)
downloadgdbstub-c1f404feb5629afb9638750facb8d4efde27917e.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 Change-Id: Ic8726ee34609c3cc1c1018ec11b58bb8e7b6fdb7 Merged-In: I62bf4963c53fd7df0dad41e1c33352718d9ccd2c
-rw-r--r--Android.bp2
-rw-r--r--patches/Android.bp.diff13
2 files changed, 14 insertions, 1 deletions
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",
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",