aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 01:42:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 01:42:30 +0000
commit7b53f2d2c03eb5a3d305aa6d6457779a9d5796c8 (patch)
tree7662db05ff516e1fc77db00b4ae486fe5ef01023
parent4eec5b3c83a4fd8003917d4664d4a5b6c60667bc (diff)
parent6b716f43493a803b9c1b9d68df3d9bdfc2e6fd07 (diff)
downloadtracing-7b53f2d2c03eb5a3d305aa6d6457779a9d5796c8.tar.gz
Migrate to cargo_embargo. am: 46be28a61c am: 84397d729b am: 6b716f4349
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tracing/+/2828231 Change-Id: I19349342574d82c83c417ec2bb73a4f8dbd83652 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json12
-rw-r--r--cargo_embargo.json14
3 files changed, 15 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index e05e052..edcf56c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// 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.
package {
@@ -20,7 +20,6 @@ license {
rust_library {
name: "libtracing",
- // has rustc warnings
host_supported: true,
crate_name: "tracing",
cargo_env_compat: true,
@@ -49,7 +48,6 @@ rust_library {
rust_library {
name: "libtracing_max_level_off",
- // has rustc warnings
host_supported: true,
crate_name: "tracing",
cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 4131f2e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "run": true,
- "device": true,
- "variants": [
- {
- },
- {
- "features": "max_level_off",
- "suffix": "_max_level_off"
- }
- ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..188aefd
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,14 @@
+{
+ "run_cargo": false,
+ "variants": [
+ {},
+ {
+ "features": [
+ "max_level_off"
+ ],
+ "module_name_overrides": {
+ "libtracing": "libtracing_max_level_off"
+ }
+ }
+ ]
+}