Snap for 10975086 from e196d44ccbe85a64edabd0fa53305b5e834042d7 to 24Q1-release
Change-Id: Iedca1440600399e13c1436092127623c5228b711
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 @@
"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
+}
