aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 22:43:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 22:43:21 +0000
commitae87ce1ac60d43092b0b25b9530d86419b5c2d36 (patch)
tree5bce07e6a09cbc8df3a39cf52ee141972c7e3a62
parent151365c0f77454d16050bea2105059c912fac821 (diff)
parentf4d31a2b397dec0d46f6312f56b315dce52a9a73 (diff)
downloadtracing-subscriber-ae87ce1ac60d43092b0b25b9530d86419b5c2d36.tar.gz
Migrate to cargo_embargo. am: 3b9df37088 am: 8c59245add am: f4d31a2b39
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tracing-subscriber/+/2828133 Change-Id: I22d169791cd478f7e2718e7990dcd3b1b950a21c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp5
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json11
3 files changed, 12 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 13b6346..e83f278 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,11 +1,8 @@
-// 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: "libtracing_subscriber",
- // has rustc warnings
host_supported: true,
crate_name: "tracing_subscriber",
cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 77581cf..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "features": "alloc,std,smallvec,parking_lot,fmt,registry"
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c9709e0
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "features": [
+ "alloc",
+ "std",
+ "smallvec",
+ "parking_lot",
+ "fmt",
+ "registry"
+ ],
+ "run_cargo": false
+}