aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-19 07:38:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-19 07:38:29 +0000
commit678a0347be6da7dfe8bd1627931a6f039aa0487c (patch)
tree2307aace5194c36842f82d9e24f58c3885d3454b
parent3d4bc7bb6e6e409707e56e6638d013a74d610a10 (diff)
parent051d3ab0c3b72c9427373bbde42bb87ee929eb6f (diff)
downloadbase64-678a0347be6da7dfe8bd1627931a6f039aa0487c.tar.gz
Migrate to cargo_embargo. am: f324b66312 am: 051d3ab0c3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/base64/+/2796432 Change-Id: If3a06fcd7df6043aa88f7fe98f16563afb7cf84a 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 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
}