Snap for 10975086 from fac4cf18cca9b1d5ff24b4278f587e8ba2eac7b6 to 24D1-release
Change-Id: I00bfd8d2d9a5bb0b89c44f5788ca5d942a8b2b1c
diff --git a/Android.bp b/Android.bp
index abf1bf4..0fec223 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: "libannotate_snippets",
crate_name: "annotate_snippets",
@@ -11,8 +9,6 @@
srcs: ["src/lib.rs"],
edition: "2018",
features: ["default"],
- rustlibs: [
- "libunicode_width",
- ],
+ rustlibs: ["libunicode_width"],
compile_multilib: "first",
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 58e46ee..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "host-first-multilib": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f702d39
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+ "package": {
+ "annotate-snippets": {
+ "device_supported": false,
+ "host_first_multilib": true
+ }
+ },
+ "run_cargo": false
+}