diff options
| author | Devin Moore <devinmoore@google.com> | 2023-04-10 23:20:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-10 23:20:42 +0000 |
| commit | 87c9afdc08a28ad43d0d3315a68881c0d747163c (patch) | |
| tree | a34f7970453eb778d54dd0fc1da09463cf5a85af | |
| parent | 305ce947f18364eaa808c3c8b7b51699f634227f (diff) | |
| parent | 00607a575331a1c8ba5edf71078c6679d34e48e3 (diff) | |
| download | crosvm-87c9afdc08a28ad43d0d3315a68881c0d747163c.tar.gz | |
ANDROID: cd into crosvm in the android-merge-2 script am: 61caee94d0 am: 3e03a306e8 am: 00607a5753
Original change: https://android-review.googlesource.com/c/platform/external/crosvm/+/2530081
Change-Id: Ibc183034e58595ffda95dd8db28d5711d9703dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | android-merge-2-cargo-embargo.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android-merge-2-cargo-embargo.sh b/android-merge-2-cargo-embargo.sh index 837d797f3..6262dc6d8 100755 --- a/android-merge-2-cargo-embargo.sh +++ b/android-merge-2-cargo-embargo.sh @@ -35,6 +35,8 @@ rustup which --toolchain $RUST_TOOLCHAIN cargo || \ rustup toolchain install $RUST_TOOLCHAIN CARGO_BIN="$(dirname $(rustup which --toolchain $RUST_TOOLCHAIN cargo))" +cd $ANDROID_BUILD_TOP/external/crosvm + if [ ! "$REUSE" ]; then rm -f cargo.out cargo.metadata rm -rf target.tmp || /bin/true |