diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-14 14:38:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 14:38:31 +0000 |
commit | fd3da7de525dedcdb38fb5ae550063b6bbce78ee (patch) | |
tree | beb0f59d446885af938aa396fa0a989a211a50ad | |
parent | 9281fc6a864d873ec3fe9b1dfd7bc57dcc65aa5d (diff) | |
parent | a00d8c8b492099b7df54a7fbfb4c1d2a84618c78 (diff) | |
download | serde-fd3da7de525dedcdb38fb5ae550063b6bbce78ee.tar.gz |
Migrate to cargo_embargo. am: edbc0e515f am: 564d36be1b am: a00d8c8b49
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/2828150
Change-Id: Ib61ade3d2d359f71cded4eb052c4199440a7c359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 48 | ||||
-rw-r--r-- | cargo2android.json | 23 | ||||
-rw-r--r-- | cargo_embargo.json | 34 |
3 files changed, 58 insertions, 47 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 { @@ -63,6 +63,29 @@ rust_library { min_sdk_version: "29", } +rust_test { + name: "serde_test_src_lib", + host_supported: true, + crate_name: "serde", + cargo_env_compat: true, + cargo_pkg_version: "1.0.158", + srcs: ["src/lib.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + test_options: { + unit_test: true, + }, + edition: "2015", + features: [ + "default", + "derive", + "rc", + "serde_derive", + "std", + ], + proc_macros: ["libserde_derive"], +} + rust_library_rlib { name: "libserde_nostd", crate_name: "serde", @@ -91,26 +114,3 @@ rust_library_rlib { vendor_available: true, min_sdk_version: "29", } - -rust_test { - name: "serde_test_src_lib", - host_supported: true, - crate_name: "serde", - cargo_env_compat: true, - cargo_pkg_version: "1.0.158", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - test_options: { - unit_test: true, - }, - edition: "2015", - features: [ - "default", - "derive", - "rc", - "serde_derive", - "std", - ], - proc_macros: ["libserde_derive"], -} diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 4f669f8..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "cfg-blocklist": [ - "std_atomic64" - ], - "dependencies": true, - "device": true, - "min_sdk_version": "29", - "run": true, - "variants": [ - { - "features": "default,derive,rc", - "tests": true - }, - { - "alloc": true, - "features": "alloc,derive", - "force-rlib": true, - "no-host": true, - "suffix": "_nostd", - "no-std": true - } - ] -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..550005b --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,34 @@ +{ + "cfg_blocklist": [ + "std_atomic64" + ], + "min_sdk_version": "29", + "run_cargo": false, + "variants": [ + { + "features": [ + "default", + "derive", + "rc" + ], + "tests": true + }, + { + "features": [ + "alloc", + "derive" + ], + "module_name_overrides": { + "libserde": "libserde_nostd" + }, + "package": { + "serde": { + "alloc": true, + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |