commit 4d171391fd74636f61321bf54f9d380a7ffcf652
author Andrew Walbran <qwandor@google.com> Mon Nov 20 18:11:14 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 20 18:11:14 2023 +0000
tree 8a2f8ca02a855a7e6380a49522514fc34d302757
parent 79b502426ef9764f1dbcc7b740ed7d2100bc453d
parent b8ca05e68730ae093aa7b315c888ea4b867763f9

Migrate to cargo_embargo. am: 7dd75b637c am: b8ca05e687

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

Change-Id: Ie87fe3a841387e25d4cf434cff6c607af03ae28b
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 8e8a16f..1d55b2f 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 {
@@ -26,9 +26,7 @@
     cargo_pkg_version: "0.2.14",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    rustlibs: [
-        "liblibc",
-    ],
+    rustlibs: ["liblibc"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "device": true,
-  "run": true
-}
\ No newline at end of file

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
+}