Fix missing native dependencies on packaged artifacts (#2748)

cortinico · facebook-github-bot · commit ce4d35e75755 · 2023-10-25T06:44:39.000-07:00
Summary: ## Motivation (required) Latest versions of Fresco have missing .so files due to a race condition on Gradle tasks. I'm imposing a task dependencies on `ndk_build_*` steps and `preBuild` steps to prevent this. Fixes #2722 Fixes #2747 ## Test Plan (required) I've tested this against `./gradlew publishToMavenLocal` upon clean build. Here the output: ``` $ unzip -l ~/.m2/repository/com/facebook/fresco/nativeimagetranscoder/3.1.1/nativeimagetranscoder-3.1.1.aar Archive: /Users/ncor/.m2/repository/com/facebook/fresco/nativeimagetranscoder/3.1.1/nativeimagetranscoder-3.1.1.aar Length Date Time Name --------- ---------- ----- ---- 7297 02-01-1980 00:00 R.txt 216 02-01-1980 00:00 AndroidManifest.xml 6034 02-01-1980 00:00 classes.jar 121 02-01-1980 00:00 META-INF/com/android/build/gradle/aar-metadata.properties 0 02-01-1980 00:00 jni/ 0 02-01-1980 00:00 jni/arm64-v8a/ 475392 02-01-1980 00:00 jni/arm64-v8a/libnative-imagetranscoder.so 0 02-01-1980 00:00 jni/armeabi-v7a/ 271736 02-01-1980 00:00 jni/armeabi-v7a/libnative-imagetranscoder.so 0 02-01-1980 00:00 jni/x86/ 557648 02-01-1980 00:00 jni/x86/libnative-imagetranscoder.so 0 02-01-1980 00:00 jni/x86_64/ 621000 02-01-1980 00:00 jni/x86_64/libnative-imagetranscoder.so --------- ------- 1939444 13 files ``` Pull Request resolved: #2748 Reviewed By: passy Differential Revision: D50641344 Pulled By: cortinico fbshipit-source-id: c518b4cf4e418dcec1ac30a78c03a649d5c66c13
diff --git a/animated-gif/build.gradle b/animated-gif/build.gradle
@@ -60,6 +60,7 @@ android {
         }
     }
     ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }
+    preBuild.dependsOn("ndk_build_gifimage")
 }
 
 apply plugin: "com.vanniktech.maven.publish"
diff --git a/imagepipeline-native/build.gradle b/imagepipeline-native/build.gradle
@@ -71,6 +71,11 @@ android {
         }
     }
     ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }
+    preBuild.dependsOn(
+        "ndk_build_bitmaps",
+        "ndk_build_imagepipeline",
+        "ndk_build_memchunk"
+    )
 }
 
 apply plugin: "com.vanniktech.maven.publish"
diff --git a/native-filters/build.gradle b/native-filters/build.gradle
@@ -75,6 +75,10 @@ android {
         abortOnError false
     }
     ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }
+    preBuild.dependsOn(
+        "ndk_build_filters",
+        "ndk_build_native-filters"
+    )
 }
 
 apply plugin: "com.vanniktech.maven.publish"
diff --git a/native-imagetranscoder/build.gradle b/native-imagetranscoder/build.gradle
@@ -48,7 +48,6 @@ task fetchNativeDeps(dependsOn: [copyLibjpeg]) {
 }
 
 android {
-
     def ndkLibs = [
             ['native-imagetranscoder', [copyLibjpeg]]]
 
@@ -76,6 +75,10 @@ android {
         abortOnError false
     }
     ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }
+    preBuild.dependsOn(
+        "ndk_build_native-imagetranscoder",
+        "copyLibjpeg"
+    )
 }
 
 apply plugin: "com.vanniktech.maven.publish"
diff --git a/static-webp/build.gradle b/static-webp/build.gradle
@@ -57,6 +57,12 @@ android {
         abortOnError false
     }
     ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }
+    preBuild.dependsOn(
+        "ndk_build_static-webp",
+        "copyLibjpeg",
+        "copyLibpng",
+        "copyLibwebp"
+    )
 }
 
 apply plugin: "com.vanniktech.maven.publish"

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ android {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }`
	`63`	`+ preBuild.dependsOn("ndk_build_gifimage")`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`apply plugin: "com.vanniktech.maven.publish"`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,11 @@ android {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }`
	`74`	`+ preBuild.dependsOn(`
	`75`	`+ "ndk_build_bitmaps",`
	`76`	`+ "ndk_build_imagepipeline",`
	`77`	`+ "ndk_build_memchunk"`
	`78`	`+ )`
`74`	`79`	`}`
`75`	`80`
`76`	`81`	`apply plugin: "com.vanniktech.maven.publish"`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,10 @@ android {`
`75`	`75`	`abortOnError false`
`76`	`76`	`}`
`77`	`77`	`ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }`
	`78`	`+ preBuild.dependsOn(`
	`79`	`+ "ndk_build_filters",`
	`80`	`+ "ndk_build_native-filters"`
	`81`	`+ )`
`78`	`82`	`}`
`79`	`83`
`80`	`84`	`apply plugin: "com.vanniktech.maven.publish"`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ task fetchNativeDeps(dependsOn: [copyLibjpeg]) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`android {`
`51`		`-`
`52`	`51`	`def ndkLibs = [`
`53`	`52`	`['native-imagetranscoder', [copyLibjpeg]]]`
`54`	`53`
`@@ -76,6 +75,10 @@ android {`
`76`	`75`	`abortOnError false`
`77`	`76`	`}`
`78`	`77`	`ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }`
	`78`	`+ preBuild.dependsOn(`
	`79`	`+ "ndk_build_native-imagetranscoder",`
	`80`	`+ "copyLibjpeg"`
	`81`	`+ )`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`apply plugin: "com.vanniktech.maven.publish"`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,12 @@ android {`
`57`	`57`	`abortOnError false`
`58`	`58`	`}`
`59`	`59`	`ndkLibs.each { lib -> makeNdkTasks lib[0], lib[1] }`
	`60`	`+ preBuild.dependsOn(`
	`61`	`+ "ndk_build_static-webp",`
	`62`	`+ "copyLibjpeg",`
	`63`	`+ "copyLibpng",`
	`64`	`+ "copyLibwebp"`
	`65`	`+ )`
`60`	`66`	`}`
`61`	`67`
`62`	`68`	`apply plugin: "com.vanniktech.maven.publish"`