Bump CMake Android version to 3.18.1 (#692)

Summary:
Pull Request resolved: https://github.com/facebook/hermes/pull/692

This Diff attemps to bump the CMake version used to build hermes for Android to the latest one `3.18.1`. That's the same version used inside React Native and will reduce discrepancies between the two build pipelines.

See here: b84350256b/Dockerfile (L112)

Reviewed By: neildhar

Differential Revision: D34681716

fbshipit-source-id: 75782fc73aac3bf292fe3b9eb8984aea3081c15f
This commit is contained in:
Nicola Corti 2022-03-08 01:32:40 -08:00 коммит произвёл Facebook GitHub Bot
Родитель 6cf9084fdc
Коммит 4dd2e4af44
4 изменённых файлов: 10 добавлений и 6 удалений

Просмотреть файл

@ -71,7 +71,7 @@ jobs:
- run:
name: Set up workspace and install dependencies
command: |
yes | sdkmanager "cmake;3.10.2.4988404" &
yes | sdkmanager "cmake;3.18.1" &
mkdir -p "$HERMES_WS_DIR" "$HERMES_WS_DIR/output"
ln -sf "$PWD" "$HERMES_WS_DIR/hermes"
sudo apt-get update
@ -80,7 +80,7 @@ jobs:
sudo cp /usr/bin/ninja /usr/bin/ninja.real
# See top comment
printf '%s\n' '#!/bin/sh' 'ninja.real -j4 "$@" || ninja.real -j1 "$@"' | sudo tee /usr/bin/ninja
ln -sf /usr/bin/ninja /opt/android/sdk/cmake/3.10.2.4988404/bin/ninja
ln -sf /usr/bin/ninja /opt/android/sdk/cmake/3.18.1/bin/ninja
- run:
name: Build Hermes Compiler
command: |
@ -563,6 +563,10 @@ jobs:
- node/install:
install-yarn: true
lts: true
- run:
name: Setup dependencies
command: |
(yes | sdkmanager "cmake;3.18.1" --verbose) || true
- run:
name: Prepare RNTester
command: |
@ -592,7 +596,7 @@ jobs:
- run:
name: Setup dependencies
command: |
(yes | sdkmanager "cmake;3.10.2.4988404" --verbose) || true
(yes | sdkmanager "cmake;3.18.1" --verbose) || true
# Check out test262 at a pinned revision to reduce flakiness
git clone https://github.com/tc39/test262
cd test262

Просмотреть файл

@ -29,7 +29,7 @@ android {
externalNativeBuild {
cmake {
version "3.10.2"
version "3.18.1"
path "src/main/cpp/CMakeLists.txt"
buildStagingDirectory = "${rootProject.ext.hermes_ws}/staging/cppruntime"
buildStagingDirectory.mkdirs()

Просмотреть файл

@ -36,7 +36,7 @@ android {
externalNativeBuild {
cmake {
version "3.10.2"
version "3.18.1"
path "../../CMakeLists.txt"
buildStagingDirectory = "${rootProject.ext.hermes_ws}/staging/hermes"
buildStagingDirectory.mkdirs()

Просмотреть файл

@ -84,7 +84,7 @@ android {
externalNativeBuild {
cmake {
version "3.10.2"
version "3.18.1"
path "../../CMakeLists.txt"
buildStagingDirectory = "${rootProject.ext.hermes_ws}/staging/intl"
buildStagingDirectory.mkdirs()