summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 18:57:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 18:57:01 +0000
commitc09babbc6291ba54407dfee14473331a8e2859af (patch)
tree0291d4a6f39952364aecedcbbf462971cf1b7018
parentab1391eb6c3a83f4c313938fc8504a29d10740f2 (diff)
parent2a28308d330cb6f7b601ba606ee69b2cc9111c16 (diff)
downloadoctets-c09babbc6291ba54407dfee14473331a8e2859af.tar.gz
Migrate to cargo_embargo. am: c82ca0ec5e am: f64ec43c07 am: 2a28308d33
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/octets/+/2824490 Change-Id: I7048524ff668cbb7d384c0a4b65e0094e25df18d 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
}