Snap for 11098369 from ca8af128d173ac2c8fefc804e8368a799b12b463 to 24D1-release
Change-Id: I22192559e430158ca483fb48d1aec9fe5e622d6c
diff --git a/Android.bp b/Android.bp
index 70ea7d7..1089f61 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 {
@@ -63,6 +63,29 @@
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 @@
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
+ }
+ }
+ }
+ ]
+}
