aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-10 00:11:46 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-10 00:11:46 +0000
commit31b4f78111c5de996aa724c37cb4fdda0792fdbe (patch)
tree6b0675ce2e9c41e9e3b330e5756732fc8073b498
parentadfbfa75e802134e84e4f2c38302315fb8ea3db0 (diff)
parent5b96f1ddfcc366d22a83218d1b07eecdac51fd2f (diff)
downloadinstant-android14-qpr2-s1-release.tar.gz
Change-Id: I0fb2995e77c8738d83af58d6fbe8bacf76503890
-rw-r--r--Android.bp6
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)7
2 files changed, 5 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index bdd1b55..c60b1d9 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 {
@@ -26,9 +26,7 @@ rust_library {
cargo_pkg_version: "0.1.12",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "libcfg_if",
- ],
+ rustlibs: ["libcfg_if"],
apex_available: [
"//apex_available:platform",
"com.android.btservices",
diff --git a/cargo2android.json b/cargo_embargo.json
index f994fab..85d370f 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,10 +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",
+ "run_cargo": false
}