aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-08 17:55:12 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-08 17:55:12 +0000
commit064020b2dfb7fb0c0ed4be32ac3abd83a2a48d09 (patch)
tree6b0675ce2e9c41e9e3b330e5756732fc8073b498
parentca881747acaf44d89e01aa99d3fd779fcabc2110 (diff)
downloadinstant-064020b2dfb7fb0c0ed4be32ac3abd83a2a48d09.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I1460abf2ed97b7b9765e779307b44acc8d54b644
-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
}