aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-05-18 17:50:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-18 17:50:56 +0000
commit024ce6d767493988dc46ade3ed6bc4320cf94678 (patch)
treedfcc00c957fa1c2786ecc9860f1d7560954238da
parent653ca7400f8a78b5e2a9e4bed93b910692bd74f8 (diff)
parentb14018485f274a0741c25b740f5522f96f8fdf74 (diff)
downloadanes-024ce6d767493988dc46ade3ed6bc4320cf94678.tar.gz
Use libbitflags-1.3.2 am: b14018485f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/anes/+/23280564 Change-Id: I938ba410e390a6f9e07abfb59935bd9cb6377b98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--patches/Android.bp.diff31
2 files changed, 34 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index a20fffb..36ba6ab 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,7 +57,7 @@ rust_test {
"parser",
],
rustlibs: [
- "libbitflags",
+ "libbitflags-1.3.2",
"libcriterion",
"liblibc",
],
@@ -82,7 +82,7 @@ rust_test {
],
rustlibs: [
"libanes",
- "libbitflags",
+ "libbitflags-1.3.2",
"libcriterion",
"liblibc",
],
@@ -101,7 +101,7 @@ rust_library {
"parser",
],
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..72a6503
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,31 @@
+diff --git a/Android.bp b/Android.bp
+index a20fffb..36ba6ab 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -57,7 +57,7 @@ rust_test {
+ "parser",
+ ],
+ rustlibs: [
+- "libbitflags",
++ "libbitflags-1.3.2",
+ "libcriterion",
+ "liblibc",
+ ],
+@@ -82,7 +82,7 @@ rust_test {
+ ],
+ rustlibs: [
+ "libanes",
+- "libbitflags",
++ "libbitflags-1.3.2",
+ "libcriterion",
+ "liblibc",
+ ],
+@@ -101,7 +101,7 @@ rust_library {
+ "parser",
+ ],
+ rustlibs: [
+- "libbitflags",
++ "libbitflags-1.3.2",
+ ],
+ apex_available: [
+ "//apex_available:platform",