From 6c48cd67cad4e7fb05390c2cd434982a65caabaa Mon Sep 17 00:00:00 2001 From: Jakob Vukalovic Date: Thu, 11 May 2023 14:21:57 +0000 Subject: 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 (cherry picked from https://android-review.googlesource.com/q/commit:3107e59c036da119fd4f4263fb985cf792e13b4b) Merged-In: I6ca7174cb3e7443ed0ab34cc2f0e94fb415194f0 Change-Id: I6ca7174cb3e7443ed0ab34cc2f0e94fb415194f0 --- Android.bp | 2 +- patches/Android.bp.diff | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 patches/Android.bp.diff 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", -- cgit v1.2.3 From ee3a3df8ebf080d01b723922bc2535fd48eb203a Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Mon, 15 May 2023 06:49:00 +0000 Subject: Revert "Use libbitflags-1.3.2" Revert submission 23170841-cherrypicker-L56400000960600321:N14500001367781407 Reason for revert: DroidMonitor: Potential culprit for Bug b/282265637 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:23170841-cherrypicker-L56400000960600321:N14500001367781407 Change-Id: Ib715793a508664854c104108db7e36763ffb6a62 --- Android.bp | 2 +- patches/Android.bp.diff | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 patches/Android.bp.diff diff --git a/Android.bp b/Android.bp index 86a6c71..fd57489 100644 --- a/Android.bp +++ b/Android.bp @@ -56,7 +56,7 @@ rust_library_host { "which-rustfmt", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libcexpr", "libclang_sys", "liblazy_static", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 0e9e66e..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,13 +0,0 @@ -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", -- cgit v1.2.3 From 79575531969c7d9d303dfe8a5ffc159937447c91 Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Mon, 15 May 2023 06:49:00 +0000 Subject: Revert "[automerge] Use libbitflags-1.3.2 2p: 6c48cd67ca" Revert submission 23170841-cherrypicker-L56400000960600321:N14500001367781407 Reason for revert: DroidMonitor: Potential culprit for Bug b/282265637 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:23170841-cherrypicker-L56400000960600321:N14500001367781407 Change-Id: I36acf2193da54bd0885ce9278648d1ad68590408 --- Android.bp | 2 +- patches/Android.bp.diff | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 patches/Android.bp.diff diff --git a/Android.bp b/Android.bp index 86a6c71..fd57489 100644 --- a/Android.bp +++ b/Android.bp @@ -56,7 +56,7 @@ rust_library_host { "which-rustfmt", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libcexpr", "libclang_sys", "liblazy_static", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 0e9e66e..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,13 +0,0 @@ -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", -- cgit v1.2.3 From 3fb4f89cf4e4526309c2555a01877e214929fd3b Mon Sep 17 00:00:00 2001 From: Jakob Vukalovic Date: Wed, 26 Apr 2023 13:33:45 +0100 Subject: 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: I505fc05afa9c9a16c60e2504caadc450bbf604f9 --- Android.bp | 2 +- patches/Android.bp.diff | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 patches/Android.bp.diff 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", -- cgit v1.2.3