diff options
author | Andrew Walbran <qwandor@google.com> | 2023-10-18 19:51:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-18 19:51:03 +0000 |
commit | e196d44ccbe85a64edabd0fa53305b5e834042d7 (patch) | |
tree | 4c9f2f78d4d6b8fb1179c37ddf5ac56b6b285e5b | |
parent | 9a03427980eef645211ebb217a19ae887a8b2c98 (diff) | |
parent | 62ff1932d60cf06c2c3d943bc81c08e40e26f789 (diff) | |
download | moveit-e196d44ccbe85a64edabd0fa53305b5e834042d7.tar.gz |
Migrate to cargo_embargo. am: c7a23a7cd3 am: 4266918bbd am: 62ff1932d6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/moveit/+/2794738
Change-Id: Ie1be79b869470ac11ddcfa567010c072130d5ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | cargo2android.json | 4 | ||||
-rw-r--r-- | cargo_embargo.json | 12 |
3 files changed, 14 insertions, 10 deletions
@@ -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 +} |