fix(android): fix codegen not being applied correctly

microsoft · Aug 17, 2022 · b8d55fb · b8d55fb
1 parent de978fc
commit b8d55fb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -15,7 +15,7 @@ plugins {
 // https://github.com/react-native-community/cli/blob/6cf12b00c02aca6d4bc843446394331d71a9749e/packages/platform-android/src/commands/runAndroid/index.ts#L180
 buildDir = "${rootDir}/${name}/build"
 
-def reactNativeDir = findNodeModulesPath("react-native", rootDir)
+def reactNativeDir = file(findNodeModulesPath("react-native", rootDir))
 def reactNativeVersion = getPackageVersionNumber("react-native", rootDir)
 
 repositories {
@@ -256,8 +256,8 @@ dependencies {
         // TODO: Remove this block when we drop support for 0.68.
         if (reactNativeVersion < 6900) {
             def hermesEngineDir =
-                findNodeModulesPath("hermes-engine", file(reactNativeDir))
-                    ?: findNodeModulesPath("hermesvm", file(reactNativeDir))
+                findNodeModulesPath("hermes-engine", reactNativeDir)
+                    ?: findNodeModulesPath("hermesvm", reactNativeDir)
             if (hermesEngineDir == null) {
                 throw new GradleException("Could not find 'hermes-engine'. Please make sure you've added it to 'package.json'.")
             }
@@ -272,7 +272,7 @@ dependencies {
         }
     }
 
-    if (buildReactNativeFromSource(rootDir)) {
+    if (project.ext.react.enableNewArchitecture) {
         implementation project(":ReactAndroid")
     } else {
         implementation "com.facebook.react:react-native:+"

diff --git a/android/test-app-util.gradle b/android/test-app-util.gradle
@@ -6,11 +6,6 @@ import java.security.MessageDigest
 
 ext.manifest = null
 
-ext.buildReactNativeFromSource = { baseDir ->
-    def reactNativePath = findNodeModulesPath("react-native", baseDir)
-    return !file("${reactNativePath}/android").exists()
-}
-
 ext.findFile = { fileName ->
     def currentDirPath = rootDir == null ? null : rootDir.toString()
 

diff --git a/test-app.gradle b/test-app.gradle
@@ -22,23 +22,6 @@ def cliAndroidDir = findNodeModulesPath("@react-native-community/cli-platform-an
 apply(from: "${cliAndroidDir}/native_modules.gradle")
 
 ext.applyTestAppSettings = { DefaultSettings settings ->
-    if (settings.buildReactNativeFromSource(settings.rootDir)) {
-        def buildFile = Paths.get("${testAppDir}/android/react-native-build.gradle")
-        settings.rootProject.buildFileName = settings.rootDir.toPath().relativize(buildFile)
-
-        def reactNativeDir = findNodeModulesPath("react-native", settings.rootDir)
-        settings.include(":ReactAndroid")
-        settings.project(":ReactAndroid")
-            .projectDir = file("${reactNativeDir}/ReactAndroid")
-
-        settings.include(":packages:react-native-codegen:android")
-        settings.project(":packages:react-native-codegen:android")
-            .projectDir = file("${reactNativeDir}/packages/react-native-codegen/android")
-
-        settings.includeBuild("${reactNativeDir}/packages/react-native-codegen/android")
-        settings.includeBuild("${reactNativeDir}/packages/react-native-gradle-plugin")
-    }
-
     settings.include(":app")
     settings.include(":support")