summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-14 19:55:37 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-14 19:55:37 +0000
commite49605476bb12275298db454f22f948f0d2c3222 (patch)
tree0291d4a6f39952364aecedcbbf462971cf1b7018
parentd6e31937fbbaae973fc63be639279da295e41b0b (diff)
parentc82ca0ec5e6522a8b124ee8fdd89e22997062306 (diff)
downloadoctets-e49605476bb12275298db454f22f948f0d2c3222.tar.gz
Snap for 11096816 from c82ca0ec5e6522a8b124ee8fdd89e22997062306 to build-tools-release
Change-Id: If89d0cb70930308f8bf871196bd0ad3ceefdb1fe
-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
}