diff options
| author | Ryan Prichard <rprichard@google.com> | 2020-06-02 19:28:48 -0700 |
|---|---|---|
| committer | Ryan Prichard <rprichard@google.com> | 2020-06-03 16:18:15 -0700 |
| commit | d847a7f370049797221ae71aef009920dad84661 (patch) | |
| tree | 30e1b5d6af179cff5f3796cc12a1c25202bb18bf | |
| parent | 3884cfab24d976d51ab422ff660c01c53457ec0c (diff) | |
| download | manifest-d847a7f370049797221ae71aef009920dad84661.tar.gz | |
Use newer ninja binary in prebuilts/build-tools
The ninja in prebuilts/ninja/${host}/ninja is much older -- it's based
on 1.6.0 rather than 1.8.2. They use different depslog formats, so when
I invoke ninja by hand, it blows away the log and forces a complete
rebuild. Using the same version as the rest of Android avoids that.
Change-Id: I75bdb7e6547d1c4673af10a3218d14a2813ffb2d
| -rw-r--r-- | default.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/default.xml b/default.xml index d9d8d4d4c..96ac16603 100644 --- a/default.xml +++ b/default.xml @@ -40,9 +40,8 @@ <project path="prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86" clone-depth="1" /> <project path="prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86" clone-depth="1" /> - <!-- ninja prebuilts --> - <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" clone-depth="1" /> - <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" clone-depth="1" /> + <!-- build-tools prebuilts (includes ninja) --> + <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" /> <!-- Go prebuilts --> <project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="darwin,pdk,tradefed" clone-depth="1" /> |