aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-10-11 18:47:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-11 18:47:04 +0000
commit175cf5af94e782b8bf4ea5400203a9b112270701 (patch)
treeb5ec62fa42c1eb9c24d158033d01f892e13190b5
parente215e6c2c4d493c382d214898b554f735f64c34b (diff)
parenta2b1a0037fae3761f340e8900024cce5e4214c43 (diff)
downloadtracing-attributes-175cf5af94e782b8bf4ea5400203a9b112270701.tar.gz
Merge "Add cargo2android.json." into main am: 72feaed978 am: a2b1a0037f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tracing-attributes/+/2776315 Change-Id: If13a5b9d8d497ae75f12a6d1589fd4d2d81205f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp5
-rw-r--r--cargo2android.json4
2 files changed, 5 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 2477e28..429532b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// This file is generated by cargo2android.py --run --device.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: [
"external_rust_crates_tracing-attributes_license",
@@ -24,7 +22,6 @@ license {
rust_proc_macro {
name: "libtracing_attributes",
- // has rustc warnings
crate_name: "tracing_attributes",
cargo_env_compat: true,
cargo_pkg_version: "0.1.23",
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..fe43c3f
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+ "run": true,
+ "device": true
+}