aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 20:16:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 20:16:54 +0000
commitb92d58c3215a596bf289ca7b688dc3e9a774d783 (patch)
treed2618b8cf461a238b69a2ff07ff803222c8fae74
parente5a40899a0b0ea6a3c97ef9e7c6c7faccc232812 (diff)
parentdbb20153d3868b780d86cd892f5482b2fb6fb100 (diff)
downloadrusticata-macros-b92d58c3215a596bf289ca7b688dc3e9a774d783.tar.gz
Migrate to cargo_embargo. am: dbb20153d3HEADmastermain
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>
-rw-r--r--Android.bp10
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)5
2 files changed, 5 insertions, 10 deletions
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 @@ rust_library {
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 @@ rust_test {
unit_test: true,
},
edition: "2018",
- rustlibs: [
- "libnom",
- ],
+ rustlibs: ["libnom"],
}
diff --git a/cargo2android.json b/cargo_embargo.json
index 8e490de..fcc96ec 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,9 +1,8 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.virt"
],
- "device": true,
- "run": true,
+ "run_cargo": false,
"tests": true
}