aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-08 20:25:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-08 20:25:20 +0000
commit87610594e9eba8d2702987d6b61ac352bf1e419b (patch)
tree861ddf40c9bf68d94d1f61bfc66ee54a660fd637
parent86102de23930208d53a6cd9d2ade99f819ba194d (diff)
parent9c3ca110667d2c52f54923d8d67945096ac274b1 (diff)
downloadarc-swap-87610594e9eba8d2702987d6b61ac352bf1e419b.tar.gz
Add cargo2android.json. am: 4d865ffc6d am: 147188528d am: 9c3ca11066
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/arc-swap/+/2822374 Change-Id: I5a5f9a2115f880a0058ab9748ab47b234c7c047f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo.out6
-rw-r--r--cargo2android.json3
3 files changed, 4 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 3f9846d..b4f56ec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run.
+// 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 5ae7bd1..0000000
--- a/cargo.out
+++ /dev/null
@@ -1,6 +0,0 @@
-### Running: /usr/local/mp400/workspace/Android/aosp-master-with-phones/development/scripts/../../prebuilts/rust/linux-x86/1.72.0/bin/cargo -v clean --target-dir target.tmp >> ./cargo.out 2>&1
-### Running: /usr/local/mp400/workspace/Android/aosp-master-with-phones/development/scripts/../../prebuilts/rust/linux-x86/1.72.0/bin/cargo -v build --target x86_64-unknown-linux-gnu --target-dir target.tmp >> ./cargo.out 2>&1
- Updating crates.io index
- Compiling arc-swap v1.6.0 (/usr/local/mp400/workspace/Android/aosp-master-with-phones/external/rust/crates/arc-swap)
- Running `rustc --crate-name arc_swap --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=0a86af8a3b21ad51 -C extra-filename=-0a86af8a3b21ad51 --out-dir /usr/local/mp400/workspace/Android/aosp-master-with-phones/external/rust/crates/arc-swap/target.tmp/x86_64-unknown-linux-gnu/debug/deps --target x86_64-unknown-linux-gnu -C incremental=/usr/local/mp400/workspace/Android/aosp-master-with-phones/external/rust/crates/arc-swap/target.tmp/x86_64-unknown-linux-gnu/debug/incremental -L dependency=/usr/local/mp400/workspace/Android/aosp-master-with-phones/external/rust/crates/arc-swap/target.tmp/x86_64-unknown-linux-gnu/debug/deps -L dependency=/usr/local/mp400/workspace/Android/aosp-master-with-phones/external/rust/crates/arc-swap/target.tmp/debug/deps`
- Finished dev [unoptimized + debuginfo] target(s) in 6.01s
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..958632b
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,3 @@
+{
+ "run": true
+} \ No newline at end of file