lazy configure ReactAndroid gradle tasks (#26314)

dulmandakh · facebook-github-bot · commit 7c8e266e390d · 2019-09-18T02:34:46.000-07:00
Summary: ReactAndroid Gradle was failing mysteriously with error below, because it was trying to read values from **android** when it wasn't configured completely. ```java extensionSupplier.get()!!.compileSdkVersion must not be null ``` or ```java compileSdkVersion is not specified. ``` It is happening because **buildReactNdkLib** task was created and configured eagerly. So this PR changes some tasks to be configured lazily, and reads values from **android** when ready. Also remove ANDROID_NDK variable check because android gradle plugin doing it automatically. ## Changelog [Android] [Changed] - lazily configure ReactAndroid gradle tasks Pull Request resolved: #26314 Test Plan: ./gradlew ReactAndroid:tasks run without errors, while master throws exception. Differential Revision: D17177945 Pulled By: cpojer fbshipit-source-id: c7a165092157d2059f946da70b801d1a475d4b8c
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
@@ -210,14 +210,14 @@ def findNdkBuildFullPath() {
         def ndkDir = property("ndk.path")
         return new File(ndkDir, getNdkBuildName()).getAbsolutePath()
     }
+
     if (System.getenv("ANDROID_NDK") != null) {
         def ndkDir = System.getenv("ANDROID_NDK")
         return new File(ndkDir, getNdkBuildName()).getAbsolutePath()
     }
-    def ndkDir = android.hasProperty("plugin") ? android.plugin.ndkFolder :
-            plugins.getPlugin("com.android.library").hasProperty("sdkHandler") ?
-                    plugins.getPlugin("com.android.library").sdkHandler.getNdkFolder() :
-                    android.ndkDirectory ? android.ndkDirectory.absolutePath : null
+
+    def ndkDir = android.ndkDirectory ? android.ndkDirectory.absolutePath : null
+
     if (ndkDir) {
         return new File(ndkDir, getNdkBuildName()).getAbsolutePath()
     }
@@ -253,7 +253,8 @@ def getNdkBuildFullPath() {
     return ndkBuildFullPath
 }
 
-task buildReactNdkLib(dependsOn: [prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog], type: Exec) {
+def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {
+    dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog)
     inputs.dir("$projectDir/../ReactCommon")
     inputs.dir("src/main/jni")
     outputs.dir("$buildDir/react-ndk/all")
@@ -271,7 +272,7 @@ task buildReactNdkLib(dependsOn: [prepareJSC, prepareHermes, prepareBoost, prepa
     )
 }
 
-task cleanReactNdkLib(type: Exec) {
+def cleanReactNdkLib = tasks.register("cleanReactNdkLib", Exec) {
     ignoreExitValue(true)
     errorOutput(new ByteArrayOutputStream())
     commandLine(getNdkBuildFullPath(),
@@ -286,14 +287,16 @@ task cleanReactNdkLib(type: Exec) {
     }
 }
 
-task packageReactNdkLibs(dependsOn: buildReactNdkLib, type: Copy) {
+def packageReactNdkLibs = tasks.register("packageReactNdkLibs", Copy) {
+    dependsOn(buildReactNdkLib)
     from("$buildDir/react-ndk/all")
     into("$buildDir/react-ndk/exported")
     exclude("**/libjsc.so")
     exclude("**/libhermes.so")
 }
 
-task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
+def packageReactNdkLibsForBuck = tasks.register("packageReactNdkLibsForBuck", Copy) {
+    dependsOn(packageReactNdkLibs)
     from("$buildDir/react-ndk/exported")
     into("src/main/jni/prebuilt/lib")
 }

Original file line number	Diff line number	Diff line change
`@@ -210,14 +210,14 @@ def findNdkBuildFullPath() {`
`210`	`210`	`def ndkDir = property("ndk.path")`
`211`	`211`	`return new File(ndkDir, getNdkBuildName()).getAbsolutePath()`
`212`	`212`	`}`
	`213`	`+`
`213`	`214`	`if (System.getenv("ANDROID_NDK") != null) {`
`214`	`215`	`def ndkDir = System.getenv("ANDROID_NDK")`
`215`	`216`	`return new File(ndkDir, getNdkBuildName()).getAbsolutePath()`
`216`	`217`	`}`
`217`		`- def ndkDir = android.hasProperty("plugin") ? android.plugin.ndkFolder :`
`218`		`- plugins.getPlugin("com.android.library").hasProperty("sdkHandler") ?`
`219`		`- plugins.getPlugin("com.android.library").sdkHandler.getNdkFolder() :`
`220`		`- android.ndkDirectory ? android.ndkDirectory.absolutePath : null`
	`218`	`+`
	`219`	`+ def ndkDir = android.ndkDirectory ? android.ndkDirectory.absolutePath : null`
	`220`	`+`
`221`	`221`	`if (ndkDir) {`
`222`	`222`	`return new File(ndkDir, getNdkBuildName()).getAbsolutePath()`
`223`	`223`	`}`
`@@ -253,7 +253,8 @@ def getNdkBuildFullPath() {`
`253`	`253`	`return ndkBuildFullPath`
`254`	`254`	`}`
`255`	`255`
`256`		`-task buildReactNdkLib(dependsOn: [prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog], type: Exec) {`
	`256`	`+def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {`
	`257`	`+ dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog)`
`257`	`258`	`inputs.dir("$projectDir/../ReactCommon")`
`258`	`259`	`inputs.dir("src/main/jni")`
`259`	`260`	`outputs.dir("$buildDir/react-ndk/all")`
`@@ -271,7 +272,7 @@ task buildReactNdkLib(dependsOn: [prepareJSC, prepareHermes, prepareBoost, prepa`
`271`	`272`	`)`
`272`	`273`	`}`
`273`	`274`
`274`		`-task cleanReactNdkLib(type: Exec) {`
	`275`	`+def cleanReactNdkLib = tasks.register("cleanReactNdkLib", Exec) {`
`275`	`276`	`ignoreExitValue(true)`
`276`	`277`	`errorOutput(new ByteArrayOutputStream())`
`277`	`278`	`commandLine(getNdkBuildFullPath(),`
`@@ -286,14 +287,16 @@ task cleanReactNdkLib(type: Exec) {`
`286`	`287`	`}`
`287`	`288`	`}`
`288`	`289`
`289`		`-task packageReactNdkLibs(dependsOn: buildReactNdkLib, type: Copy) {`
	`290`	`+def packageReactNdkLibs = tasks.register("packageReactNdkLibs", Copy) {`
	`291`	`+ dependsOn(buildReactNdkLib)`
`290`	`292`	`from("$buildDir/react-ndk/all")`
`291`	`293`	`into("$buildDir/react-ndk/exported")`
`292`	`294`	`exclude("**/libjsc.so")`
`293`	`295`	`exclude("**/libhermes.so")`
`294`	`296`	`}`
`295`	`297`
`296`		`-task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {`
	`298`	`+def packageReactNdkLibsForBuck = tasks.register("packageReactNdkLibsForBuck", Copy) {`
	`299`	`+ dependsOn(packageReactNdkLibs)`
`297`	`300`	`from("$buildDir/react-ndk/exported")`
`298`	`301`	`into("src/main/jni/prebuilt/lib")`
`299`	`302`	`}`