summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-21 00:12:48 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-21 00:12:48 +0000
commit3b515c49b88133b83fd0a89e0bf0c7873da8eeea (patch)
tree32a543cb7de12e587741bb8cb0b3c28791c6f838
parent16e0ef9e5a19ca12691bf807530e29fcd125c38c (diff)
parent9da1263a05352419807958ca2988cd06bad39c80 (diff)
downloadparking_lot_core-android14-qpr2-s1-release.tar.gz
Change-Id: Ia71854aa391fabe12f99a47be9ee8e80d26eec58
-rw-r--r--Android.bp4
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)7
2 files changed, 4 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 31025f1..966a86f 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 {
@@ -41,7 +41,6 @@ license {
rust_library {
name: "libparking_lot_core",
- // has rustc warnings
host_supported: true,
crate_name: "parking_lot_core",
cargo_env_compat: true,
@@ -65,7 +64,6 @@ rust_library {
rust_test {
name: "parking_lot_core_test_src_lib",
- // has rustc warnings
host_supported: true,
crate_name: "parking_lot_core",
cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo_embargo.json
index da746ae..c9aea70 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,11 +1,10 @@
{
- "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",
+ "run_cargo": false,
"tests": true
}