aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-04-26 13:33:45 +0100
committerJakob Vukalović <jakobvukalovic@google.com>2023-05-18 17:40:59 +0000
commit100d4deca7488abb50f87991ec7bc28fbcb7f3f5 (patch)
tree91d16e073ae7410f627ac8f80e91e426f221ab6a
parent571ee0388ab0c2bd71b750c94ee6bfc9dbdc5d2a (diff)
downloadbindgen-100d4deca7488abb50f87991ec7bc28fbcb7f3f5.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: I6ca7174cb3e7443ed0ab34cc2f0e94fb415194f0 Merged-In: I505fc05afa9c9a16c60e2504caadc450bbf604f9
-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 fd57489..86a6c71 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,7 +56,7 @@ rust_library_host {
"which-rustfmt",
],
rustlibs: [
- "libbitflags",
+ "libbitflags-1.3.2",
"libcexpr",
"libclang_sys",
"liblazy_static",
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..0e9e66e
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index fd57489..86a6c71 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -56,7 +56,7 @@ rust_library_host {
+ "which-rustfmt",
+ ],
+ rustlibs: [
+- "libbitflags",
++ "libbitflags-1.3.2",
+ "libcexpr",
+ "libclang_sys",
+ "liblazy_static",