aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Farrell <jamesfarrell@google.com>2023-09-12 03:54:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-12 03:54:59 +0000
commit2a949c9937ae2566ada781f485f4c0dbc29aad03 (patch)
tree503248b69db64398767835816eff774eb182e540
parenta5fc34ec88f48b06bf2556fc60544d3dba71ed53 (diff)
parentd7c02a5d0cfc42bff29097700e1062eebc3cba94 (diff)
downloadsharded-slab-2a949c9937ae2566ada781f485f4c0dbc29aad03.tar.gz
Add cargo2android.json am: ba6458e93b am: 0940b6aee7 am: 0d57be62a5 am: f8c5f39a03 am: d7c02a5d0c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/sharded-slab/+/2747000 Change-Id: Iad0685d863e98721b07c7b11020964b05f4eb598 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo.out8
-rw-r--r--cargo2android.json4
3 files changed, 5 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 912376a..fc8322b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// 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.
diff --git a/cargo.out b/cargo.out
deleted file mode 100644
index c385a88..0000000
--- a/cargo.out
+++ /dev/null
@@ -1,8 +0,0 @@
-### Running: /home/nputikhin/.cargo/bin/cargo -v clean --target-dir target.tmp >> ./cargo.out 2>&1
-### Running: /home/nputikhin/.cargo/bin/cargo -v build --target x86_64-unknown-linux-gnu --target-dir target.tmp >> ./cargo.out 2>&1
- Updating crates.io index
- Compiling lazy_static v1.4.0
- Running `/home/nputikhin/.rustup/toolchains/1.71.0-x86_64-unknown-linux-gnu/bin/rustc --crate-name lazy_static /home/nputikhin/.cargo/registry/src/index.crates.io-6f17d22bba15001f/lazy_static-1.4.0/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 -C metadata=16678afa456335ea -C extra-filename=-16678afa456335ea --out-dir /home/nputikhin/sharded-slab/target.tmp/x86_64-unknown-linux-gnu/debug/deps --target x86_64-unknown-linux-gnu -L dependency=/home/nputikhin/sharded-slab/target.tmp/x86_64-unknown-linux-gnu/debug/deps -L dependency=/home/nputikhin/sharded-slab/target.tmp/debug/deps --cap-lints allow`
- Compiling sharded-slab v0.1.4 (/home/nputikhin/sharded-slab)
- Running `/home/nputikhin/.rustup/toolchains/1.71.0-x86_64-unknown-linux-gnu/bin/rustc --crate-name sharded_slab --edition=2018 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 -C metadata=b624f8642c0c6609 -C extra-filename=-b624f8642c0c6609 --out-dir /home/nputikhin/sharded-slab/target.tmp/x86_64-unknown-linux-gnu/debug/deps --target x86_64-unknown-linux-gnu -C incremental=/home/nputikhin/sharded-slab/target.tmp/x86_64-unknown-linux-gnu/debug/incremental -L dependency=/home/nputikhin/sharded-slab/target.tmp/x86_64-unknown-linux-gnu/debug/deps -L dependency=/home/nputikhin/sharded-slab/target.tmp/debug/deps --extern lazy_static=/home/nputikhin/sharded-slab/target.tmp/x86_64-unknown-linux-gnu/debug/deps/liblazy_static-16678afa456335ea.rmeta`
- Finished dev [unoptimized + debuginfo] target(s) in 2.65s
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
+}