Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I6822a3ee8d59e8fe9944171e097178a2e5bb2e8b

5 files changed, 52 insertions, 56 deletions

diff --git a/Android.bp b/Android.bp
index 3f312fb..c650f2e 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.
 
 // WARNING! This crate has a change in dependency structure that is not yet
@@ -54,11 +54,14 @@ rust_library {
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: ["unstable_boringssl"],
-    cfgs: ["boringssl", "soong"],
+    cfgs: [
+        "boringssl",
+        "soong",
+    ],
     rustlibs: [
         "libbitflags-1.3.2",
-        "libcfg_if",
         "libbssl_ffi",
+        "libcfg_if",
         "libforeign_types",
         "liblibc",
         "libonce_cell",
@@ -80,7 +83,10 @@ rust_library_host_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: ["unstable_boringssl"],
-    cfgs: ["boringssl", "soong"],
+    cfgs: [
+        "boringssl",
+        "soong",
+    ],
     rustlibs: [
         "libbitflags-1.3.2",
         "libcfg_if",
diff --git a/README.android b/README.android
index 02da029..0c28f17 100644
--- a/README.android
+++ b/README.android
@@ -19,10 +19,10 @@
     redshell is not able to access it).
 4.  The repository should now be in a `tmp_auto_upgrade` branch, and the Android.bp will contain
     some error message.
-5.  Run cargo2android
+5.  Run cargo_embargo
 
     ```
-    $ cargo2android.py --config ./cargo2android.json
+    $ cargo_embargo run cargo_embargo.json
     ```
 6.  Clean up the changes in external/boringssl repository, and double check that the resulting
     Android.bp builds correctly by running `m libopenssl`.
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 7c9a127..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dep-suffixes": {
-    "bitflags": "-1.3.2"
-  },
-  "features": "unstable_boringssl",
-  "run": true,
-  "vendor-available": true,
-  "patch": "patches/Android.bp.diff",
-  "variants": [
-    {
-      "device": true
-    },
-    {
-      "suffix": "_static",
-      "force-rlib": true
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..8b5e8b0
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,35 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "extra_cfg": ["soong"],
+  "features": [
+    "unstable_boringssl"
+  ],
+  "package": {
+    "openssl": {
+      "patch": "patches/Android.bp.diff"
+    }
+  },
+  "variants": [
+    {
+      "module_name_overrides": {
+        "libbitflags": "libbitflags-1.3.2",
+        "libopenssl_sys": "libbssl_ffi"
+      }
+    },
+    {
+      "module_name_overrides": {
+        "libbitflags": "libbitflags-1.3.2",
+        "libopenssl": "libopenssl_static"
+      },
+      "package": {
+        "openssl": {
+          "device_supported": false,
+          "force_rlib": true
+        }
+      }
+    }
+  ]
+}
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
index 56d2015..b9f0654 100644
--- a/patches/Android.bp.diff
+++ b/patches/Android.bp.diff
@@ -1,38 +1,15 @@
 diff --git a/Android.bp b/Android.bp
-index b10f5b0..5214daa 100644
+index 1e027e2..c650f2e 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -54,11 +54,11 @@ rust_library {
-     srcs: ["src/lib.rs"],
-     edition: "2018",
-     features: ["unstable_boringssl"],
--    cfgs: ["boringssl"],
-+    cfgs: ["boringssl", "soong"],
-     rustlibs: [
-         "libbitflags-1.3.2",
-         "libcfg_if",
--        "libopenssl_sys",
-+        "libbssl_ffi",
+@@ -93,7 +93,9 @@ rust_library_host_rlib {
          "libforeign_types",
          "liblibc",
          "libonce_cell",
-@@ -81,15 +81,17 @@ rust_library {
-     srcs: ["src/lib.rs"],
-     edition: "2018",
-     features: ["unstable_boringssl"],
--    cfgs: ["boringssl"],
-+    cfgs: ["boringssl", "soong"],
-     rustlibs: [
-         "libbitflags-1.3.2",
-         "libcfg_if",
 -        "libopenssl_sys",
-         "libforeign_types",
-         "liblibc",
-         "libonce_cell",
-     ],
++    ],
 +    rlibs: [
 +        "libbssl_ffi_static",
-+    ],
+     ],
      proc_macros: ["libopenssl_macros"],
-     apex_available: [
-         "//apex_available:platform",
+ }