From 0181584735e4b76cd0219b441cec86f7df5578e2 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Wed, 17 Nov 2021 13:19:45 -0800 Subject: [PATCH] Update build tools (#4866) * Update build tools SDK API level 31 NDK 23 Kotlin 1.6 * Preserve tool suffix for Windows --- BUILDING.md | 2 +- android/build.gradle | 13 ++++++------- android/gradle.properties | 2 ++ android/gradle/wrapper/gradle-wrapper.properties | 1 + build/android/ndk.version | 2 +- build/toolchain-aarch64-linux-android.cmake | 6 +++--- build/toolchain-arm7-linux-android.cmake | 6 +++--- build/toolchain-x86-linux-android.cmake | 6 +++--- build/toolchain-x86_64-linux-android.cmake | 6 +++--- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 0326df7026..0ea0eb40b9 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -15,7 +15,7 @@ To build Filament for Android you must also install the following: - Android Studio Arctic Fox or more recent - Android SDK -- Android NDK "side-by-side" 22.1 or higher +- Android NDK "side-by-side" 23.1 or higher ### Environment variables diff --git a/android/build.gradle b/android/build.gradle index 60534d2253..cade773614 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,3 @@ -import java.nio.file.Paths - // This script accepts the following parameters: // // com.google.android.filament.dist-dir @@ -73,11 +71,11 @@ buildscript { ext.versions = [ 'minSdk': 19, - 'targetSdk': 30, - 'compileSdk': 30, - 'kotlin': '1.5.31', - 'buildTools': '30.0.3', - 'ndk': '22.1.7171670' + 'targetSdk': 31, + 'compileSdk': 31, + 'kotlin': '1.6.0', + 'buildTools': '31.0.0', + 'ndk': '23.1.7779620' ] ext.deps = [ @@ -89,6 +87,7 @@ buildscript { ] dependencies { + // NOTE: See TODO in gradle.properties once we move to Gradle 7.2 classpath 'com.android.tools.build:gradle:7.0.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" } diff --git a/android/gradle.properties b/android/gradle.properties index 953d718ec9..77848d9c09 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -20,6 +20,8 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true org.gradle.unsafe.configuration-cache=true +# TODO: Remove this when we switch to Gradle 7.4 +org.gradle.unsafe.configuration-cache.max-problems=3 com.google.android.filament.tools-dir=../../../out/release/filament com.google.android.filament.dist-dir=../out/android-release/filament diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 0f80bbf516..14baaeae9e 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,3 +1,4 @@ +#Wed Nov 17 10:40:18 PST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip diff --git a/build/android/ndk.version b/build/android/ndk.version index 19e2b99124..1d30edfd90 100644 --- a/build/android/ndk.version +++ b/build/android/ndk.version @@ -1 +1 @@ -22.1.7171670 \ No newline at end of file +23.1.7779620 \ No newline at end of file diff --git a/build/toolchain-aarch64-linux-android.cmake b/build/toolchain-aarch64-linux-android.cmake index 272e9e1793..1365b71e61 100644 --- a/build/toolchain-aarch64-linux-android.cmake +++ b/build/toolchain-aarch64-linux-android.cmake @@ -50,9 +50,9 @@ if(WIN32) endif() set(CMAKE_C_COMPILER ${TOOLCHAIN}/bin/${ARCH}${API_LEVEL}-clang${COMPILER_SUFFIX}) set(CMAKE_CXX_COMPILER ${TOOLCHAIN}/bin/${ARCH}${API_LEVEL}-clang++${COMPILER_SUFFIX}) -set(CMAKE_AR ${TOOLCHAIN}/bin/${ARCH}-ar${TOOL_SUFFIX} CACHE FILEPATH "Archiver") -set(CMAKE_RANLIB ${TOOLCHAIN}/bin/${ARCH}-ranlib${TOOL_SUFFIX}) -set(CMAKE_STRIP ${TOOLCHAIN}/bin/${ARCH}-strip${TOOL_SUFFIX}) +set(CMAKE_AR ${TOOLCHAIN}/bin/llvm-ar${TOOL_SUFFIX} CACHE FILEPATH "Archiver") +set(CMAKE_RANLIB ${TOOLCHAIN}/bin/llvm-ranlib${TOOL_SUFFIX}) +set(CMAKE_STRIP ${TOOLCHAIN}/bin/llvm-strip${TOOL_SUFFIX}) # where is the target environment set(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN}/sysroot) diff --git a/build/toolchain-arm7-linux-android.cmake b/build/toolchain-arm7-linux-android.cmake index a704c401dc..611f13699e 100644 --- a/build/toolchain-arm7-linux-android.cmake +++ b/build/toolchain-arm7-linux-android.cmake @@ -51,9 +51,9 @@ if(WIN32) endif() set(CMAKE_C_COMPILER ${TOOLCHAIN}/bin/${ARCH}${API_LEVEL}-clang${COMPILER_SUFFIX}) set(CMAKE_CXX_COMPILER ${TOOLCHAIN}/bin/${ARCH}${API_LEVEL}-clang++${COMPILER_SUFFIX}) -set(CMAKE_AR ${TOOLCHAIN}/bin/${AR_ARCH}-ar${TOOL_SUFFIX} CACHE FILEPATH "Archiver") -set(CMAKE_RANLIB ${TOOLCHAIN}/bin/${AR_ARCH}-ranlib${TOOL_SUFFIX}) -set(CMAKE_STRIP ${TOOLCHAIN}/bin/${AR_ARCH}-strip${TOOL_SUFFIX}) +set(CMAKE_AR ${TOOLCHAIN}/bin/llvm-ar${TOOL_SUFFIX} CACHE FILEPATH "Archiver") +set(CMAKE_RANLIB ${TOOLCHAIN}/bin/llvm-ranlib${TOOL_SUFFIX}) +set(CMAKE_STRIP ${TOOLCHAIN}/bin/llvm-strip${TOOL_SUFFIX}) # where is the target environment set(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN}/sysroot) diff --git a/build/toolchain-x86-linux-android.cmake b/build/toolchain-x86-linux-android.cmake index 41c1d3358e..f72fecf5c2 100644 --- a/build/toolchain-x86-linux-android.cmake +++ b/build/toolchain-x86-linux-android.cmake @@ -50,9 +50,9 @@ if(WIN32) endif() set(CMAKE_C_COMPILER ${TOOLCHAIN}/bin/${ARCH}${API_LEVEL}-clang${COMPILER_SUFFIX}) set(CMAKE_CXX_COMPILER ${TOOLCHAIN}/bin/${ARCH}${API_LEVEL}-clang++${COMPILER_SUFFIX}) -set(CMAKE_AR ${TOOLCHAIN}/bin/${ARCH}-ar${TOOL_SUFFIX} CACHE FILEPATH "Archiver") -set(CMAKE_RANLIB ${TOOLCHAIN}/bin/${ARCH}-ranlib${TOOL_SUFFIX}) -set(CMAKE_STRIP ${TOOLCHAIN}/bin/${ARCH}-strip${TOOL_SUFFIX}) +set(CMAKE_AR ${TOOLCHAIN}/bin/llvm-ar${TOOL_SUFFIX} CACHE FILEPATH "Archiver") +set(CMAKE_RANLIB ${TOOLCHAIN}/bin/llvm-ranlib${TOOL_SUFFIX}) +set(CMAKE_STRIP ${TOOLCHAIN}/bin/llvm-strip${TOOL_SUFFIX}) # where is the target environment set(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN}/sysroot) diff --git a/build/toolchain-x86_64-linux-android.cmake b/build/toolchain-x86_64-linux-android.cmake index 4b80751437..93939522f5 100644 --- a/build/toolchain-x86_64-linux-android.cmake +++ b/build/toolchain-x86_64-linux-android.cmake @@ -50,9 +50,9 @@ if(WIN32) endif() set(CMAKE_C_COMPILER ${TOOLCHAIN}/bin/${ARCH}${API_LEVEL}-clang${COMPILER_SUFFIX}) set(CMAKE_CXX_COMPILER ${TOOLCHAIN}/bin/${ARCH}${API_LEVEL}-clang++${COMPILER_SUFFIX}) -set(CMAKE_AR ${TOOLCHAIN}/bin/${ARCH}-ar${TOOL_SUFFIX} CACHE FILEPATH "Archiver") -set(CMAKE_RANLIB ${TOOLCHAIN}/bin/${ARCH}-ranlib${TOOL_SUFFIX}) -set(CMAKE_STRIP ${TOOLCHAIN}/bin/${ARCH}-strip${TOOL_SUFFIX}) +set(CMAKE_AR ${TOOLCHAIN}/bin/llvm-ar${TOOL_SUFFIX} CACHE FILEPATH "Archiver") +set(CMAKE_RANLIB ${TOOLCHAIN}/bin/llvm-ranlib${TOOL_SUFFIX}) +set(CMAKE_STRIP ${TOOLCHAIN}/bin/llvm-strip${TOOL_SUFFIX}) # where is the target environment set(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN}/sysroot)