aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-15 21:53:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-15 21:53:43 +0000
commit05a784b1a4e6218af5914de766f3c6792ec90874 (patch)
tree174efe2976c21a1bb2b2313ed53c4890373d12f4
parenta179eea1ce6cc3755938335fdcee2bcf129c3b6a (diff)
parent6bbbfbbe6d827fb3d2376d141021f8835440acb0 (diff)
downloadsyn-05a784b1a4e6218af5914de766f3c6792ec90874.tar.gz
Migrate to cargo_embargo. am: 4fb48c577f am: c0b5ab190f am: 6bbbfbbe6d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/syn/+/2832418 Change-Id: I247d203815ad884b68b359b8dc5cb630cdc04c77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json16
3 files changed, 18 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index ccf8b371..233de89f 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,7 +41,7 @@ rust_library_host {
name: "libsyn",
crate_name: "syn",
cargo_env_compat: true,
- cargo_pkg_version: "2.0.16",
+ cargo_pkg_version: "2.0.38",
srcs: ["src/lib.rs"],
edition: "2021",
features: [
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 5f9ce448..00000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "features": "default,full,visit,visit-mut,extra-traits",
- "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 00000000..08634530
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,16 @@
+{
+ "features": [
+ "default",
+ "full",
+ "visit",
+ "visit-mut",
+ "extra-traits"
+ ],
+ "package": {
+ "syn": {
+ "device_supported": false,
+ "host_first_multilib": true
+ }
+ },
+ "run_cargo": false
+}