aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-04-26 14:44:12 +0100
committerJakob Vukalović <jakobvukalovic@google.com>2023-05-18 17:43:15 +0000
commitb6e056415a924ad5dd0668043dea48524c3fee3f (patch)
tree72b3e8d52425ee785e948aad11d07927f501bae0
parent384bd3e50422e3f54fece0f1b03f23bb84543b27 (diff)
downloaduserfaultfd-b6e056415a924ad5dd0668043dea48524c3fee3f.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. Test: Build Change-Id: Ic6bc618320e376397dd51e891bbf8c748eac69f6 Merged-In: Iba3f549c62526d31c58f94bd6eec9d0af426ab2c
-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 69d9cb2..02cdcf2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,7 +47,7 @@ rust_library {
edition: "2018",
features: ["default"],
rustlibs: [
- "libbitflags",
+ "libbitflags-1.3.2",
"libcfg_if",
"liblibc",
"libnix",
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..d7c81bc
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index 69d9cb2..02cdcf2 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -47,7 +47,7 @@ rust_library {
+ edition: "2018",
+ features: ["default"],
+ rustlibs: [
+- "libbitflags",
++ "libbitflags-1.3.2",
+ "libcfg_if",
+ "liblibc",
+ "libnix",