summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Duong <joshuaduong@google.com>2023-11-29 11:02:12 -0800
committerJoshua Duong <joshuaduong@google.com>2023-11-29 11:02:12 -0800
commit6bbca619149d419c9dca8384e362cff1955f36c0 (patch)
tree1be1d8b81d3b0497f911e9cb5d4bbf7a6522bd42
parenta1b9c40250a0fad18d195937fb6c7d9f6d001f3f (diff)
downloadmanifest-emu-prebuilts.tar.gz
Use ninja from main.emu-prebuilts
Ninja from emu-master-dev is too old to meet minimum requirements to build Qt6 (>= 1.7.2). Bug: 299464843 Test: N/A Change-Id: I2ca4f70b4d621b59dac84439b41dc71583ed0bbc
-rw-r--r--default.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/default.xml b/default.xml
index a56a94edd..e15b5e440 100644
--- a/default.xml
+++ b/default.xml
@@ -36,18 +36,19 @@
<project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" revision="main" groups="notdefault,platform-linux" />
<project path="prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86" clone-depth="1" groups="notdefault,platform-linux" />
<project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" revision="main" groups="notdefault,platform-linux" />
- <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" clone-depth="1" groups="notdefault,platform-linux" />
+ <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" clone-depth="1" revision="main" groups="notdefault,platform-linux" />
<project path="prebuilts/python/linux-x86" name="platform/prebuilts/python/linux-x86" clone-depth="1" revision="llvm-toolchain" groups="notdefault,platform-linux" />
<!-- Windows only toolchain dependencies -->
<project path="prebuilts/bazel/windows-x86_64" name="platform/prebuilts/bazel/windows-x86_64" clone-depth="1" groups="notdefault,platform-windows" />
<project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" revision="main" groups="notdefault,platform-windows" />
<project path="prebuilts/cmake/windows-x86" name="platform/prebuilts/cmake/windows-x86" clone-depth="1" groups="notdefault,platform-windows" />
+ <project path="prebuilts/ninja/windows-x86" name="platform/prebuilts/ninja/windows-x86" clone-depth="1" revision="main" groups="notdefault,platform-windows" />
<project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" revision="llvm-toolchain" groups="notdefault,platform-windows" />
<!-- Darwin (macos) only toolchain dependencies -->
<project path="prebuilts/bazel/darwin-x86_64" name="platform/prebuilts/bazel/darwin-x86_64" clone-depth="1" groups="notdefault,platform-darwin" />
- <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" />
+ <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" clone-depth="1" revision="main" groups="notdefault,platform-darwin" />
<project path="prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" />
<project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" revision="main" groups="notdefault,platform-darwin" />
<project path="prebuilts/python/darwin-x86" name="platform/prebuilts/python/darwin-x86" clone-depth="1" revision="llvm-toolchain" groups="notdefault,platform-darwin" />