diff options
| author | Fred Sladkey <fsladkey@google.com> | 2021-09-30 16:25:27 +0000 |
|---|---|---|
| committer | Fred Sladkey <fsladkey@google.com> | 2021-10-27 16:18:52 +0000 |
| commit | aebbe94ed38e342097fc754bcaaac67970f7efa6 (patch) | |
| tree | 0489284585091b9a0d51ef3c2ff66587c2d47490 | |
| parent | 90cd40626d813fb54aadfb75912610e2b0fd1bb2 (diff) | |
| download | manifest-aebbe94ed38e342097fc754bcaaac67970f7efa6.tar.gz | |
Update NDK / CMake prebuilts
Upgrades NDK version from 21 to 23, unpins CMake from 3.10.2 and set to master (3.18.1). Adds dependency on Ninja prebuilt which was previously bundled with CMake 3.10.2.
Bug: 196982163
Change-Id: I6848b251c7058143a2e360d78241efa1ceaefe64
| -rw-r--r-- | default.xml | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/default.xml b/default.xml index bd1697d6b..9f7e234fb 100644 --- a/default.xml +++ b/default.xml @@ -85,7 +85,7 @@ groups="notdefault,platform-darwin" /> <project path="prebuilts/fullsdk-darwin/ndk" - name="toolchain/prebuilts/ndk-darwin/r21" + name="toolchain/prebuilts/ndk-darwin/r23" revision="master" clone-depth="1" groups="notdefault,platform-darwin" /> @@ -105,9 +105,19 @@ <project path="prebuilts/fullsdk-darwin/cmake" name="platform/prebuilts/cmake/darwin-x86" - revision="fc59035d8c856055f2a263dc8a2f9de96c959cc2" + revision="master" groups="notdefault,platform-darwin" - clone-depth="1" /> + clone-depth="1"> + <linkfile src="bin/cmake" dest="prebuilts/fullsdk-linux/native-build-tools/bin/cmake" /> + </project> + <project + path="prebuilts/fullsdk-darwin/ninja" + name="platform/prebuilts/ninja/darwin-x86" + revision="master" + groups="notdefault,platform-darwin" + clone-depth="1" > + <linkfile src="ninja" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/ninja" /> + </project> <!-- SDK dependencies (linux) --> <!-- Config: shallow + master revision --> @@ -125,7 +135,7 @@ groups="notdefault,platform-linux" /> <project path="prebuilts/fullsdk-linux/ndk" - name="toolchain/prebuilts/ndk/r21" + name="toolchain/prebuilts/ndk/r23" revision="master" clone-depth="1" groups="notdefault,platform-linux" /> @@ -145,9 +155,19 @@ <project path="prebuilts/fullsdk-linux/cmake" name="platform/prebuilts/cmake/linux-x86" - revision="de5fa1c66d3bdcbf2bbc62d2504ec6b0b0fb74e1" + revision="master" groups="notdefault,platform-linux" - clone-depth="1" /> + clone-depth="1"> + <linkfile src="bin/cmake" dest="prebuilts/fullsdk-linux/native-build-tools/bin/cmake" /> + </project> + <project + path="prebuilts/fullsdk-linux/ninja" + name="platform/prebuilts/ninja/linux-x86" + revision="master" + groups="notdefault,platform-linux" + clone-depth="1" > + <linkfile src="ninja" dest="prebuilts/fullsdk-linux/native-build-tools/bin/ninja" /> + </project> <!-- Golden images --> <project path="golden" name="platform/frameworks/support-golden" clone-depth="1" /> |