aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 19:52:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 19:52:42 +0000
commit666b88946a0413a7de59c56a253152b3cfe5cf76 (patch)
treec62d61a89204a5e3fff767a72e988ef85d569353
parent8a545c809b1fbace0683b0af5a63adb1ee928a01 (diff)
parentf92c43c0a7c90d8a1e9453438229ca00aa697f02 (diff)
downloadnom-666b88946a0413a7de59c56a253152b3cfe5cf76.tar.gz
Migrate to cargo_embargo. am: caf5fb6a44 am: 8427f73c71 am: f92c43c0a7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nom/+/2796354 Change-Id: I3b5404a6ddcdfc2402c9f1598c75854642f0ccf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json11
3 files changed, 12 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index f9f1cbb..cc1dbbb 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 73b74df..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "device": true,
- "features": "alloc,std",
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..3740539
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "features": [
+ "alloc",
+ "std"
+ ],
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "run_cargo": false
+}