Migrate to cargo_embargo.
Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I2b4e579dd316c4582243fe0343737c3c26619903
diff --git a/Android.bp b/Android.bp
index f2971e4..b632469 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 {
@@ -32,9 +32,7 @@
"simd",
"zerocopy-derive",
],
- rustlibs: [
- "libbyteorder",
- ],
+ rustlibs: ["libbyteorder"],
proc_macros: ["libzerocopy_derive"],
apex_available: [
"//apex_available:platform",
@@ -58,9 +56,7 @@
"simd",
"zerocopy-derive",
],
- rustlibs: [
- "libbyteorder_nostd",
- ],
+ rustlibs: ["libbyteorder_nostd"],
proc_macros: ["libzerocopy_derive"],
apex_available: [
"//apex_available:platform",
@@ -90,9 +86,7 @@
"simd",
"zerocopy-derive",
],
- rustlibs: [
- "libbyteorder_nostd",
- ],
+ rustlibs: ["libbyteorder_nostd"],
proc_macros: ["libzerocopy_derive"],
apex_available: [
"//apex_available:platform",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 68d4eaf..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "device": true,
- "run": true,
- "features": "derive,byteorder,simd",
- "variants": [
- {
- "tests": false
- },
- {
- "alloc": true,
- "dependency-suffix": "_nostd",
- "features": "alloc,derive,byteorder,simd",
- "force-rlib": true,
- "no-host": true,
- "suffix": "_nostd",
- "no-std": true
- },
- {
- "dependency-suffix": "_nostd",
- "features": "derive,byteorder,simd",
- "force-rlib": true,
- "no-host": true,
- "suffix": "_nostd_noalloc",
- "no-std": true
- }
- ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..a61e4b9
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,50 @@
+{
+ "run_cargo": false,
+ "variants": [
+ {
+ "features": [
+ "derive",
+ "byteorder",
+ "simd"
+ ]
+ },
+ {
+ "features": [
+ "alloc",
+ "derive",
+ "byteorder",
+ "simd"
+ ],
+ "module_name_overrides": {
+ "libbyteorder": "libbyteorder_nostd",
+ "libzerocopy": "libzerocopy_nostd"
+ },
+ "package": {
+ "zerocopy": {
+ "alloc": true,
+ "force_rlib": true,
+ "host_supported": false,
+ "no_std": true
+ }
+ }
+ },
+ {
+ "features": [
+ "derive",
+ "byteorder",
+ "simd"
+ ],
+ "module_name_overrides": {
+ "libbyteorder": "libbyteorder_nostd",
+ "libzerocopy": "libzerocopy_nostd_noalloc"
+ },
+ "package": {
+ "zerocopy": {
+ "force_rlib": true,
+ "host_supported": false,
+ "no_std": true
+ }
+ }
+ }
+ ]
+}
