aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-06-01 00:12:35 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-06-01 00:12:35 +0000
commitf0ff38ca24ed12e66a23ae93e94118070e261007 (patch)
tree35a71e3996c7b601d2281be74cf5bd39e8fd3908
parent3f6f9c291153050862b48bf2a2ccf054fd14c63e (diff)
parentf3a7fe803291d7d718d8b90b097f66d8ac03501c (diff)
downloadbindgen-cli-f0ff38ca24ed12e66a23ae93e94118070e261007.tar.gz
Snap for 10235775 from f3a7fe803291d7d718d8b90b097f66d8ac03501c to simpleperf-release
Change-Id: Iccc1c5314950cea1e8a15cc643882247df2c4395
-rw-r--r--cargo2android-extra-module.bp12
-rw-r--r--cargo2android.json2
-rw-r--r--patches/Android.bp.diff21
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",
-+}