Use cmake 3.22.1 from Android SDK (#1959)
Co-authored-by: 南宫雪珊 <vvb2060@gmail.com>
This commit is contained in:
parent
cbd19d17a8
commit
dd8dcfbab1
|
|
@ -62,7 +62,7 @@ jobs:
|
||||||
restore-keys: native-cache-
|
restore-keys: native-cache-
|
||||||
- name: Install dep
|
- name: Install dep
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get install -y ccache ninja-build
|
sudo apt-get install -y ccache
|
||||||
ccache -o max_size=1G
|
ccache -o max_size=1G
|
||||||
ccache -o hash_dir=false
|
ccache -o hash_dir=false
|
||||||
ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion'
|
ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion'
|
||||||
|
|
@ -77,8 +77,6 @@ jobs:
|
||||||
echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
|
echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
|
||||||
echo 'android.native.buildOutput=verbose' >> gradle.properties
|
echo 'android.native.buildOutput=verbose' >> gradle.properties
|
||||||
echo 'buildCache { local { removeUnusedEntriesAfterDays = 1 } }' >> settings.gradle.kts
|
echo 'buildCache { local { removeUnusedEntriesAfterDays = 1 } }' >> settings.gradle.kts
|
||||||
ln -s $(which ninja) $(dirname $(which cmake)) # https://issuetracker.google.com/issues/206099937
|
|
||||||
echo "cmake.dir=$(dirname $(dirname $(which cmake)))" >> local.properties
|
|
||||||
./gradlew zipAll
|
./gradlew zipAll
|
||||||
ccache -s
|
ccache -s
|
||||||
- name: Prepare artifact
|
- name: Prepare artifact
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,12 @@ fun Project.configureBaseExtension() {
|
||||||
ndkVersion = androidCompileNdkVersion
|
ndkVersion = androidCompileNdkVersion
|
||||||
buildToolsVersion = androidBuildToolsVersion
|
buildToolsVersion = androidBuildToolsVersion
|
||||||
|
|
||||||
|
externalNativeBuild {
|
||||||
|
cmake {
|
||||||
|
version = "3.22.1+"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = androidMinSdkVersion
|
minSdk = androidMinSdkVersion
|
||||||
targetSdk = androidTargetSdkVersion
|
targetSdk = androidTargetSdkVersion
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue