aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-17 09:26:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-17 09:26:35 +0000
commitbf676ffb10537b54f4eee2729013a95271705a87 (patch)
treefdb207bce34acd8e46838e32357ed5984a184cfe
parentf19117fdb44b500195c5e8a94e829210599d7fc2 (diff)
parent077e683b2398f6607861928293460bf7efff4f60 (diff)
downloadquote-bf676ffb10537b54f4eee2729013a95271705a87.tar.gz
Migrate to cargo_embargo. am: 1bf1613b75 am: 83f5f28eb7 am: 077e683b23
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quote/+/2832678 Change-Id: Idf3d2890fcd651f05cbd885af452e06b824350fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json9
3 files changed, 12 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index f34b424..e21d65d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 {
@@ -41,15 +41,13 @@ rust_library_host {
name: "libquote",
crate_name: "quote",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.26",
+ cargo_pkg_version: "1.0.33",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
"default",
"proc-macro",
],
- rustlibs: [
- "libproc_macro2",
- ],
+ rustlibs: ["libproc_macro2"],
compile_multilib: "first",
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bb77633..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "host-first-multilib": true,
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..1d0a6bb
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+ "package": {
+ "quote": {
+ "device_supported": false,
+ "host_first_multilib": true
+ }
+ },
+ "run_cargo": false
+}