diff options
| author | Jakob Vukalovic <jakobvukalovic@google.com> | 2023-05-19 13:11:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-19 13:11:52 +0000 |
| commit | 277ea6916910d223abfe2378186aa3bbc087380a (patch) | |
| tree | 023dd32e3b28457d86f866764c19e619196c684f | |
| parent | 48ee729b1f8ab48ea563e20e8416a3956c15d92c (diff) | |
| parent | dc1f22505cf92102eafb2e6fab4331f1bd230164 (diff) | |
| download | clap-277ea6916910d223abfe2378186aa3bbc087380a.tar.gz | |
Use libbitflags-1.3.2 am: 02d398b847 am: 919c95f378 am: 50aad336b3 am: dc1f22505c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clap/+/2565179
Change-Id: Ic67c7782a80e25518271e81eaa46dd828adf28a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | 3.2.23/Android.bp | 2 | ||||
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 22 |
3 files changed, 25 insertions, 3 deletions
diff --git a/3.2.23/Android.bp b/3.2.23/Android.bp index b37cf33..db4e9eb 100644 --- a/3.2.23/Android.bp +++ b/3.2.23/Android.bp @@ -49,7 +49,7 @@ rust_library { edition: "2021", features: ["std"], rustlibs: [ - "libbitflags", + "libbitflags-1.3.2", "libclap_lex", "libindexmap", "libtextwrap", @@ -53,7 +53,7 @@ rust_library { "usage", ], rustlibs: [ - "libbitflags", + "libbitflags-1.3.2", "libclap_lex", "libonce_cell", ], @@ -82,7 +82,7 @@ rust_binary { "usage", ], rustlibs: [ - "libbitflags", + "libbitflags-1.3.2", "libclap", "libclap_lex", "libonce_cell", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff new file mode 100644 index 0000000..a4dc389 --- /dev/null +++ b/patches/Android.bp.diff @@ -0,0 +1,22 @@ +diff --git a/Android.bp b/Android.bp +index 235586c..1595d5e 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -53,7 +53,7 @@ rust_library { + "usage", + ], + rustlibs: [ +- "libbitflags", ++ "libbitflags-1.3.2", + "libclap_lex", + "libonce_cell", + ], +@@ -82,7 +82,7 @@ rust_binary { + "usage", + ], + rustlibs: [ +- "libbitflags", ++ "libbitflags-1.3.2", + "libclap", + "libclap_lex", + "libonce_cell", |