From 0b4417b43f66e3de91e9d54099440be14d97434b Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@fb.com>
Date: Tue, 4 Oct 2022 03:27:07 -0700
Subject: [PATCH] Cleanup the template after prefab support (#34843)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/34843

We can now remove a lot of unnecessary code to copy .so
files around as they're consumed via prefab from :ReactAndroid

Changelog:
[Android] [Changed] - Cleanup the Android template after prefab support

Reviewed By: cipolleschi

Differential Revision: D40014642

fbshipit-source-id: 00e69ea62bdb4882b40b8b6f19cdf80235c847b5
---
 ReactAndroid/build.gradle                   | 13 -------------
 packages/rn-tester/android/app/build.gradle | 20 --------------------
 template/android/app/build.gradle           | 18 ------------------
 3 files changed, 51 deletions(-)

diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index f28b3af5df2a19..3e58f829b87fc4 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -339,10 +339,6 @@ def reactNativeArchitectures() {
 }
 
 tasks.register("packageReactNdkLibsForBuck") {
-    dependsOn("packageReactNdkDebugLibsForBuck")
-}
-
-tasks.register("packageReactNdkDebugLibsForBuck", Copy) {
     dependsOn("mergeDebugNativeLibs")
     // Shared libraries (.so) are copied from the merged_native_libs folder instead
     from("$buildDir/intermediates/merged_native_libs/debug/out/lib/")
@@ -351,15 +347,6 @@ tasks.register("packageReactNdkDebugLibsForBuck", Copy) {
     into("src/main/jni/prebuilt/lib")
 }
 
-tasks.register("packageReactNdkReleaseLibsForBuck", Copy) {
-    dependsOn("mergeReleaseNativeLibs")
-    // Shared libraries (.so) are copied from the merged_native_libs folder instead
-    from("$buildDir/intermediates/merged_native_libs/release/out/lib/")
-    exclude("**/libjsc.so")
-    exclude("**/libhermes.so")
-    into("src/main/jni/prebuilt/lib")
-}
-
 task installArchives {
     dependsOn("publishAllPublicationsToNpmRepository")
 }
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index 383740d382369a..865e9898ac9521 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -246,27 +246,7 @@ android {
     }
 }
 
-def packageReactDebugNdkLibs = tasks.register("packageReactDebugNdkLibs", Copy) {
-    // TODO: handle extracting .so from prebuilt :ReactAndroid.
-    dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
-    dependsOn("generateCodegenArtifactsFromSchema")
-    from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-    into("$buildDir/react-ndk/exported")
-}
-def packageReactReleaseNdkLibs = tasks.register("packageReactReleaseNdkLibs", Copy) {
-    // TODO: handle extracting .so from prebuilt :ReactAndroid.
-    dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
-    dependsOn("generateCodegenArtifactsFromSchema")
-    from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-    into("$buildDir/react-ndk/exported")
-}
-
 afterEvaluate {
-    preHermesReleaseBuild.dependsOn(packageReactReleaseNdkLibs)
-    preJscReleaseBuild.dependsOn(packageReactReleaseNdkLibs)
-    preHermesDebugBuild.dependsOn(packageReactDebugNdkLibs)
-    preJscDebugBuild.dependsOn(packageReactDebugNdkLibs)
-
     // As we're consuming Hermes from source, we want to make sure
     // `hermesc` is built before we actually invoke the `emit*HermesResource` task
     emitHermesDebugHermesResources.dependsOn(":ReactAndroid:hermes-engine:buildHermes")
diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle
index 9042d07256dbb2..ea7ea35382b61e 100644
--- a/template/android/app/build.gradle
+++ b/template/android/app/build.gradle
@@ -170,24 +170,6 @@ android {
         buildFeatures {
             prefab true
         }
-        def reactAndroidProjectDir = project(':ReactAndroid').projectDir
-        def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
-            dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
-            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-            into("$buildDir/react-ndk/exported")
-        }
-        def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
-            dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
-            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-            into("$buildDir/react-ndk/exported")
-        }
-        afterEvaluate {
-            // If you wish to add a custom TurboModule or component locally,
-            // you should uncomment this line.
-            // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
-            preDebugBuild.dependsOn(packageReactNdkDebugLibs)
-            preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
-        }
     }
     packagingOptions {
         pickFirst '**/libc++_shared.so'