aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-05-19 12:29:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-19 12:29:11 +0000
commitf339055247752bd771411c3ac484fbfaa9c360fc (patch)
tree408168a82ac7c26b5f4d6db75788ad8ae6e15b48
parent51f9d272765c7411658b15ceffd7f1c84c7afa8f (diff)
parentb281259b04605fe68766f0ca6203d2d34f592851 (diff)
downloadaarch64-paging-f339055247752bd771411c3ac484fbfaa9c360fc.tar.gz
Use libbitflags-1.3.2 am: b2d678c832 am: 6a60222e73 am: b281259b04
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/aarch64-paging/+/2563161 Change-Id: I889f4fff8f23462536b653f8a6e9bdcd6ff2bb08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--patches/Android.bp.diff22
2 files changed, 24 insertions, 2 deletions
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",
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",