diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-13 14:46:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-13 14:46:12 +0000 |
commit | d5f639b2c00c76de49d29c29aa0e78c6387985ba (patch) | |
tree | c10071f21609dbab1ea57735cf3f4a51e6595bf0 | |
parent | 63c0e80ae383fa6da80900f6234c839a5a8a1b83 (diff) | |
parent | c6cd5626f8ce6e0feccb29bcb12228f9b7966f2c (diff) | |
download | bindgen-master.tar.gz |
Merge "Migrate to cargo_embargo." into main am: e992ceba9c am: 5db8de64a0 am: c6cd5626f8HEADmastermainemu-34-2-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bindgen/+/2841554
Change-Id: Ifbc669ac0c995cf94207f826cb70a36bafd028f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 6 | ||||
-rw-r--r-- | cargo_embargo.json | 15 |
3 files changed, 16 insertions, 7 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index ea1fdc2..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "copy-out": true, - "features": "__cli,experimental,runtime,which-rustfmt", - "host-first-multilib": true, - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..3ffb84d --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,15 @@ +{ + "features": [ + "__cli", + "experimental", + "runtime", + "which-rustfmt" + ], + "package": { + "bindgen": { + "copy_out": true, + "device_supported": false, + "host_first_multilib": true + } + } +} |