summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 17:32:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 17:32:57 +0000
commit2a28308d330cb6f7b601ba606ee69b2cc9111c16 (patch)
tree0291d4a6f39952364aecedcbbf462971cf1b7018
parent2fe550ea4262308a3bc614b1c68a6068a3e65284 (diff)
parentf64ec43c07d450da6b4fb537e388dc19c597816c (diff)
downloadoctets-2a28308d330cb6f7b601ba606ee69b2cc9111c16.tar.gz
Migrate to cargo_embargo. am: c82ca0ec5e am: f64ec43c07
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/octets/+/2824490 Change-Id: I287f0388f6fa25c5a3f1f4c925f5cb4bc00a925f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)7
2 files changed, 4 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index c52e946..8f5217d 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/cargo_embargo.json
index e445ec0..b8ed541 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,10 +1,9 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.resolv"
],
- "device": true,
- "min-sdk-version": "29",
- "run": true,
+ "min_sdk_version": "29",
+ "run_cargo": false,
"tests": true
}