aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 18:02:35 +0100
committerAndrew Walbran <qwandor@google.com>2023-10-18 18:02:35 +0100
commitc7a23a7cd36c6a40bfc3e8ade5caabc981d07616 (patch)
tree4c9f2f78d4d6b8fb1179c37ddf5ac56b6b285e5b
parent39e7d0a22213ac52fcbb2e1b31d9f1975f179613 (diff)
downloadmoveit-c7a23a7cd36c6a40bfc3e8ade5caabc981d07616.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I0ec61e2509cddc9abf25054143f5080609f6fee3
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json12
3 files changed, 14 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 066549e..ed91624 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
-
-
rust_library_host {
name: "libmoveit",
crate_name: "moveit",
@@ -14,7 +12,5 @@ rust_library_host {
"alloc",
"cxx",
],
- rustlibs: [
- "libcxx",
- ],
+ rustlibs: ["libcxx"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index afd502e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "features": "cxx,alloc",
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b8b58a2
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,12 @@
+{
+ "features": [
+ "cxx",
+ "alloc"
+ ],
+ "package": {
+ "moveit": {
+ "device_supported": false
+ }
+ },
+ "run_cargo": false
+}