aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-15 20:30:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-15 20:30:21 +0000
commit5939ec59c6c3e1b2fe986b607a63fe749e3bef5b (patch)
tree363befbfbb58e8eb39969e5a1445654288c91f0a
parent9139201f98ca6c7138e1b227b368e5bcea716cc1 (diff)
parentda905c9e9aec1e93960423cae03e320f0ce02d3d (diff)
downloadunsafe-libyaml-5939ec59c6c3e1b2fe986b607a63fe749e3bef5b.tar.gz
Migrate to cargo_embargo. am: 2b205855d7 am: da905c9e9a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unsafe-libyaml/+/2832813 Change-Id: I15ccce2c8ea98bb25cb290b0cf62f17417740d55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp12
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json9
3 files changed, 12 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index b282c8f..0545cf9 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_rlib {
name: "libunsafe_libyaml",
crate_name: "unsafe_libyaml",
@@ -19,9 +17,7 @@ rust_binary_host {
cargo_pkg_version: "0.2.9",
srcs: ["src/bin/run-emitter-test-suite.rs"],
edition: "2021",
- rustlibs: [
- "libunsafe_libyaml",
- ],
+ rustlibs: ["libunsafe_libyaml"],
}
rust_binary_host {
@@ -31,7 +27,5 @@ rust_binary_host {
cargo_pkg_version: "0.2.9",
srcs: ["src/bin/run-parser-test-suite.rs"],
edition: "2021",
- rustlibs: [
- "libunsafe_libyaml",
- ],
+ rustlibs: ["libunsafe_libyaml"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index e3ff1ac..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "force-rlib": true,
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b7aeb95
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+ "package": {
+ "unsafe-libyaml": {
+ "device_supported": false,
+ "force_rlib": true
+ }
+ },
+ "run_cargo": false
+}