From 1c0d938b85b4995d5a7ea0eb3c898a152d929754 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Mon, 23 Oct 2023 12:06:54 +0100
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp.
Change-Id: Iccfb0cc83028b92b60718e57faed08a7701ae979
---
 Android.bp         |  6 +++---
 cargo2android.json | 12 ------------
 cargo_embargo.json |  9 +++++++++
 3 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 72b6b37..f8d4683 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,6 @@ rust_library {
             // liblog is not added as a dependency for linux_musl target
             enabled: false,
         },
-    }
-    ,
+    },
+
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 17c8006..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "add-module-block": "cargo2android_glibc.bp",
-  "apex-available": [
-    "//apex_available:platform",
-    "//apex_available:anyapex"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b0b55c1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "min_sdk_version": "29",
+  "package": {
+    "android_log-sys": {
+      "add_module_block": "cargo2android_glibc.bp"
+    }
+  },
+  "run_cargo": false
+}
-- 
cgit v1.2.3