aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 16:32:20 +0100
committerAndrew Walbran <qwandor@google.com>2023-10-18 16:32:20 +0100
commit865991ca3278e1a4b4369dc25c43246965f057ee (patch)
tree6a563dd6ee57d2493ae4879184315ae449dd8208
parent774e270bd799c74c7f91bf2fafba544d088699a3 (diff)
downloadannotate-snippets-865991ca3278e1a4b4369dc25c43246965f057ee.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I517a8ae7c6e37de848df837f09224910eace1bad
-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
+}