aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 05:19:52 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 05:19:52 +0000
commite761165fbdf5d3b3bb1aebea4a6469dc2093cfed (patch)
treedfcc00c957fa1c2786ecc9860f1d7560954238da
parent14c4715065a416e92253ab14146c4d029c427f4f (diff)
parentb14018485f274a0741c25b740f5522f96f8fdf74 (diff)
downloadanes-aml_tz5_341510010.tar.gz
Snap for 10453563 from b14018485f274a0741c25b740f5522f96f8fdf74 to mainline-tzdata5-releaseaml_tz5_341510050aml_tz5_341510010aml_tz5_341510010
Change-Id: Iafd917a4d1cc200940da365b10794502a1eed824
-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",