aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 18:51:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 18:51:38 +0000
commit4266918bbdfd97b9f8ff6db30a3051d2aba45b92 (patch)
tree4c9f2f78d4d6b8fb1179c37ddf5ac56b6b285e5b
parent927f71a825d311b67171be6f5898d726b2177d4b (diff)
parentc7a23a7cd36c6a40bfc3e8ade5caabc981d07616 (diff)
downloadmoveit-4266918bbdfd97b9f8ff6db30a3051d2aba45b92.tar.gz
Migrate to cargo_embargo. am: c7a23a7cd3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/moveit/+/2794738 Change-Id: Ie58bc2ff1e1a840be9abea07c54ce4356dae5d14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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
+}