Fix NDK path propagation
Summary: Latest Android Gradle plugin doesn't respond to ANDROID_NDK env variable, so I propagated it explicitly and included with recommended `ndkPath` clause. Changelog: [Internal] allow-large-files Reviewed By: fkgozali Differential Revision: D29593132 fbshipit-source-id: 0785fe92385037d2d4cf290c2462b299800b6928
This commit is contained in:
Родитель
6caec9d91f
Коммит
0b40fea60c
|
@ -433,6 +433,9 @@ task installArchives {
|
|||
android {
|
||||
compileSdkVersion 30
|
||||
ndkVersion ANDROID_NDK_VERSION
|
||||
if (ANDROID_NDK_PATH != null) {
|
||||
ndkPath ANDROID_NDK_PATH
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion(21)
|
||||
|
|
|
@ -39,5 +39,6 @@ allprojects {
|
|||
// used to override ndk path on CI
|
||||
if (System.getenv("LOCAL_ANDROID_NDK_VERSION") != null) {
|
||||
setProperty("ANDROID_NDK_VERSION", System.getenv("LOCAL_ANDROID_NDK_VERSION"))
|
||||
ext["ANDROID_NDK_PATH"] = System.getenv("ANDROID_NDK")
|
||||
}
|
||||
}
|
||||
|
|
|
@ -131,6 +131,9 @@ def useIntlJsc = false
|
|||
android {
|
||||
compileSdkVersion 29
|
||||
ndkVersion ANDROID_NDK_VERSION
|
||||
if (ANDROID_NDK_PATH != null) {
|
||||
ndkPath ANDROID_NDK_PATH
|
||||
}
|
||||
|
||||
dexOptions {
|
||||
javaMaxHeapSize "4g"
|
||||
|
|
Загрузка…
Ссылка в новой задаче