commit 60d782f8d6e915a3e6d857327866f86dd8e3bfa2
author Andrew Walbran <qwandor@google.com> Wed Nov 08 20:20:10 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 08 20:20:10 2023 +0000
tree ae8659336830661123d37042d9de1a0f39cd9906
parent 55a2b1a6923728845f062003cfd072e30a91647b
parent 02ad4c11088e4666dcaa11e6dff6930489eb451e

Migrate to cargo_embargo. am: 02ad4c1108

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

Change-Id: Idb977d8e5f7d3df91d377b9c42789dca8f9e41a6
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 09ee54e..5849f58 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 {
@@ -45,9 +45,7 @@
     cargo_pkg_version: "0.6.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    rustlibs: [
-        "libnom",
-    ],
+    rustlibs: ["libnom"],
     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
+}