commit b92d58c3215a596bf289ca7b688dc3e9a774d783
author Andrew Walbran <qwandor@google.com> Mon Nov 13 20:16:54 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 13 20:16:54 2023 +0000
tree d2618b8cf461a238b69a2ff07ff803222c8fae74
parent e5a40899a0b0ea6a3c97ef9e7c6c7faccc232812
parent dbb20153d3868b780d86cd892f5482b2fb6fb100

Migrate to cargo_embargo. am: dbb20153d3

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusticata-macros/+/2828070

Change-Id: I71c08d1c8c46d7092bc4a213ef43e957867da4e2
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 4b50bf1..3755207 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 {
@@ -47,9 +47,7 @@
     cargo_pkg_version: "4.1.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    rustlibs: [
-        "libnom",
-    ],
+    rustlibs: ["libnom"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
@@ -71,7 +69,5 @@
         unit_test: true,
     },
     edition: "2018",
-    rustlibs: [
-        "libnom",
-    ],
+    rustlibs: ["libnom"],
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8e490de..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "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..fcc96ec
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "run_cargo": false,
+  "tests": true
+}