aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 19:03:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 19:03:33 +0000
commitda8c1adfef9acd2109d0b5cfeb2a655e02c3032d (patch)
tree44a17ef69f062d983988478734690f350f9b11fa
parent8cc7d1af1237bfea14ca77ea66532979c8f9cfa9 (diff)
parent135ed2e16e4447c0d33b20d502e97a65a86880cd (diff)
downloadsharded-slab-da8c1adfef9acd2109d0b5cfeb2a655e02c3032d.tar.gz
Migrate to cargo_embargo. am: 135ed2e16e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/sharded-slab/+/2828210 Change-Id: I06ace8821b0639c1a7969d2c59de45be9a43ddef 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.json3
3 files changed, 5 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index fc8322b..921c495 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 {
name: "libsharded_slab",
host_supported: true,
@@ -11,9 +9,7 @@ rust_library {
cargo_pkg_version: "0.1.4",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "liblazy_static",
- ],
+ rustlibs: ["liblazy_static"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index fe43c3f..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "run": true,
- "device": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}