summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-15 00:12:30 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-15 00:12:30 +0000
commit71bd013c0d54e986f09349529347f37ac62b84e9 (patch)
treedf7c08f6154dcfe32a64a11060d1dceb272f6ea7
parent987ce3b96c2a32cfefab767c246074c0cb90afe9 (diff)
parentba8a3734f0831d51bf1fb4744d07b86398cde9b5 (diff)
downloadlock_api-android14-qpr2-s2-release.tar.gz
Change-Id: Ic5fcb068e9d306642329d3e229e17b6d8c776e30
-rw-r--r--Android.bp6
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)6
2 files changed, 4 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 06c2d2f..0cf269e 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 {
@@ -46,9 +46,7 @@ rust_library {
srcs: ["src/lib.rs"],
edition: "2018",
cfgs: ["has_const_fn_trait_bound"],
- rustlibs: [
- "libscopeguard",
- ],
+ rustlibs: ["libscopeguard"],
apex_available: [
"//apex_available:platform",
"com.android.btservices",
diff --git a/cargo2android.json b/cargo_embargo.json
index da746ae..f3c0ef8 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,11 +1,9 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.btservices",
"com.android.virt"
],
- "device": true,
- "min-sdk-version": "29",
- "run": true,
+ "min_sdk_version": "29",
"tests": true
}