From d8002de88cae5040a9a3438e30e4b9354cb1cf06 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Wed, 8 Mar 2023 02:53:49 -0800 Subject: [PATCH] NDK version from gradle.properties Summary: ^ With these changes, we can build the project by overriding these version from a gradle build. ./gradlew :assembleDebug -DNDK_VERSION=21.4.7075529 -DFBJNI_VERSION=0.2.2 Reviewed By: passy Differential Revision: D43879098 fbshipit-source-id: 8790aa12a086373194d45687d70ceb73b07713b9 --- build.gradle | 4 ++-- gradle.properties | 2 ++ react-native/ReactNativeFlipperExample/android/build.gradle | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 3fd403562..79cc24ab5 100644 --- a/build.gradle +++ b/build.gradle @@ -48,8 +48,8 @@ ext { minSdkVersion = 15 targetSdkVersion = 31 compileSdkVersion = 31 - buildToolsVersion = '30.0.3' - ndkVersion = '23.0.7599858' + buildToolsVersion = "30.0.3" + ndkVersion = "$NDK_VERSION" } ext.deps = [ diff --git a/gradle.properties b/gradle.properties index 90d65f589..01c315d30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,6 +20,8 @@ POM_ISSUES_URL=https://github.com/facebook/flipper/issues/ LITHO_VERSION=0.44.0 ANDROIDX_VERSION=1.3.0 KOTLIN_VERSION=1.6.20 +# NDK +NDK_VERSION=23.0.7599858 # Gradle internals org.gradle.internal.repository.max.retries=10 org.gradle.internal.repository.initial.backoff=1250 diff --git a/react-native/ReactNativeFlipperExample/android/build.gradle b/react-native/ReactNativeFlipperExample/android/build.gradle index 8a1102597..b4b337dd5 100644 --- a/react-native/ReactNativeFlipperExample/android/build.gradle +++ b/react-native/ReactNativeFlipperExample/android/build.gradle @@ -12,7 +12,7 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 31 targetSdkVersion = 31 - ndkVersion = '23.0.7599858' + ndkVersion = "$NDK_VERSION" } repositories { google()