commit 4b5cb5571fa4b88af4afbdc9679b951d76f0b18c
author Andrew Walbran <qwandor@google.com> Tue Nov 14 20:42:10 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 14 20:42:10 2023 +0000
tree 1fa441f65c917e0185ed344b31c75275efa586c2
parent 03e725a9bb8b142e5d9601576d80dbd5ca43c130
parent 02c476de32c21674fbe203a9eb4bb7275e589855

Migrate to cargo_embargo. am: 05b35cb48a am: 5f10413b13 am: 02c476de32

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/os_str_bytes/+/2828069

Change-Id: I5264e612e3f7327155a7ed59ce63a6e530ec29cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 0e35c4a..2cd3864 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 {
@@ -51,9 +51,7 @@
         "memchr",
         "raw_os_str",
     ],
-    rustlibs: [
-        "libmemchr",
-    ],
+    rustlibs: ["libmemchr"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index ff6df50..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "tests": true
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+  "run_cargo": false
+}