diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-05-15 17:36:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-15 17:36:10 +0000 |
| commit | 02f2edd19337315ec2d2885ffe7e0348814bec92 (patch) | |
| tree | 35a71e3996c7b601d2281be74cf5bd39e8fd3908 | |
| parent | bd6f9f6a1aa8be419b8e666124c0054a674d8513 (diff) | |
| parent | 0a105542967a7abb5822017e9a2950e49f3927f6 (diff) | |
| download | bindgen-cli-02f2edd19337315ec2d2885ffe7e0348814bec92.tar.gz | |
Use add-toplevel-block rather than patch. am: f3a7fe8032 am: 0a10554296
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bindgen-cli/+/2586960
Change-Id: Iecb16b0aedcba5732c0c7eab702ab20fbeb7df62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cargo2android-extra-module.bp | 12 | ||||
| -rw-r--r-- | cargo2android.json | 2 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 21 |
3 files changed, 13 insertions, 22 deletions
diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp new file mode 100644 index 0000000..e9a914c --- /dev/null +++ b/cargo2android-extra-module.bp @@ -0,0 +1,12 @@ +rust_library_host { + name: "libbindgen_cli", + crate_name: "bindgen_cli", + srcs: ["options.rs"], + edition: "2018", + rustlibs: [ + "libbindgen", + "libclap", + "libenv_logger", + ], + compile_multilib: "first", +}
\ No newline at end of file diff --git a/cargo2android.json b/cargo2android.json index 2954b81..7679bd5 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,5 +1,5 @@ { - "patch": "patches/Android.bp.diff", + "add-toplevel-block": "cargo2android-extra-module.bp", "host-first-multilib": true, "run": true } diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 932ad41..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index c7f0f52..518b91a 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -27,3 +27,16 @@ rust_binary_host { - ], - compile_multilib: "first", - } -+ -+rust_library_host { -+ name: "libbindgen_cli", -+ crate_name: "bindgen_cli", -+ srcs: ["options.rs"], -+ edition: "2018", -+ rustlibs: [ -+ "libbindgen", -+ "libclap", -+ "libenv_logger", -+ ], -+ compile_multilib: "first", -+} |