From 589c2a96436da44bb1235c343bcd0d2f1e80f077 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Wed, 6 Dec 2023 16:17:15 +0000
Subject: Migrate to cargo_embargo.

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

diff --git a/0.3.3/Android.bp b/0.3.3/Android.bp
index 65601b5..063d0c2 100644
--- a/0.3.3/Android.bp
+++ b/0.3.3/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 {
@@ -50,9 +50,7 @@ rust_test {
         unit_test: true,
     },
     edition: "2018",
-    rustlibs: [
-        "libunicode_segmentation",
-    ],
+    rustlibs: ["libunicode_segmentation"],
 }
 
 rust_library {
@@ -63,7 +61,7 @@ rust_library {
     cargo_pkg_version: "0.3.3",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    rustlibs: [
-        "libunicode_segmentation",
-    ],
+    rustlibs: ["libunicode_segmentation"],
+    product_available: true,
+    vendor_available: true,
 }
diff --git a/0.3.3/cargo2android.json b/0.3.3/cargo2android.json
deleted file mode 100644
index 8b712d9..0000000
--- a/0.3.3/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "tests": true,
-  "name-suffix": "_deprecated"
-}
diff --git a/0.3.3/cargo_embargo.json b/0.3.3/cargo_embargo.json
new file mode 100644
index 0000000..5e90c3d
--- /dev/null
+++ b/0.3.3/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "apex_available": [],
+  "module_name_overrides": {
+    "heck_test_src_lib": "heck_test_src_lib_deprecated",
+    "libheck": "libheck_deprecated"
+  },
+  "run_cargo": false,
+  "tests": true
+}
-- 
cgit v1.2.3