aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 19:15:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 19:15:25 +0000
commitfac4cf18cca9b1d5ff24b4278f587e8ba2eac7b6 (patch)
tree6a563dd6ee57d2493ae4879184315ae449dd8208
parentaf3b58e3ea50c62891ef47a1aa687cd28c112f21 (diff)
parentafb4826c1bb6c276d7dc84ca9fd0c3fe7ca13c3b (diff)
downloadannotate-snippets-fac4cf18cca9b1d5ff24b4278f587e8ba2eac7b6.tar.gz
Migrate to cargo_embargo. am: 865991ca32 am: ba148f0e3e am: afb4826c1b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/annotate-snippets/+/2796413 Change-Id: I279073a7f7204019f3370dd298e3feebf7c22f55 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.json9
3 files changed, 11 insertions, 10 deletions
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 @@ rust_library_host {
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
+}