From f3a7fe803291d7d718d8b90b097f66d8ac03501c Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 15 May 2023 13:25:00 +0000 Subject: Use add-toplevel-block rather than patch. This is hopefully more maintainable. Test: Ran cargo2android, no change in output Change-Id: Ia96aeb1934b99d65d788a5bd83d7c4be295f8fdc --- cargo2android-extra-module.bp | 12 ++++++++++++ cargo2android.json | 2 +- patches/Android.bp.diff | 21 --------------------- 3 files changed, 13 insertions(+), 22 deletions(-) create mode 100644 cargo2android-extra-module.bp delete mode 100644 patches/Android.bp.diff 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", -+} -- cgit v1.2.3