diff options
| author | 2021-08-19 18:50:05 +0000 | |
|---|---|---|
| committer | 2021-08-19 18:50:05 +0000 | |
| commit | ee16502a40087ba970e76bbe71460635839524f3 (patch) | |
| tree | a278f46a3cb9a1edf09dcae134ec8ede2365efc2 | |
| parent | fa692af71485e019b3d9ed91884e94e9f9f33d95 (diff) | |
| parent | 32e4e66d931e30a44bce14b0bacd0f048439a793 (diff) | |
Merge "Use combined.ninja for soong_docs null build test." am: 5470d24ab7 am: 13b2e9ba81 am: 32e4e66d93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1802328
Change-Id: Icca9c06573235efff2e745a477ca9c431cf19a8c
| -rwxr-xr-x | tests/bootstrap_test.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/bootstrap_test.sh b/tests/bootstrap_test.sh index 9342d75e2..76b2ee99a 100755 --- a/tests/bootstrap_test.sh +++ b/tests/bootstrap_test.sh @@ -477,7 +477,8 @@ function test_null_build_after_docs { run_soong local mtime1=$(stat -c "%y" out/soong/build.ninja) - prebuilts/build-tools/linux-x86/bin/ninja -f out/soong/build.ninja soong_docs + prebuilts/build-tools/linux-x86/bin/ninja -f out/combined.ninja soong_docs + run_soong local mtime2=$(stat -c "%y" out/soong/build.ninja) |