aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-20 03:18:47 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-20 03:18:47 +0000
commit0c59be22833e8b9ba981b3d086d4e3f92bd0f355 (patch)
tree2307aace5194c36842f82d9e24f58c3885d3454b
parent626e5b27cff9738b335d85891d82e4fb926fad9c (diff)
parent1f5576e580637ab6da6e67b12a90368e5cb4beff (diff)
downloadbase64-0c59be22833e8b9ba981b3d086d4e3f92bd0f355.tar.gz
Snap for 10975086 from 1f5576e580637ab6da6e67b12a90368e5cb4beff to 24Q1-release
Change-Id: Ief9e99ae3c9ae016804c444d9f60b28c49ff5f7e
-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 9f8a254..98e6049 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 1736c62..7ccfee6 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,10 +1,9 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.resolv",
"com.android.virt"
],
- "device": true,
- "min-sdk-version": "29",
- "run": true
+ "min_sdk_version": "29",
+ "run_cargo": false
}