fixup! fix(android): fix codegen not being applied correctly

Author: tido64

android/app/build.gradle

@@ -10,18 +10,22 @@ plugins {
     id("org.jetbrains.kotlin.kapt") version "${kotlinVersion}"
 }
 
-if (isNewArchitectureEnabled(project)) {
-    apply(plugin: "com.facebook.react")
-}
-
 // `react-native run-android` is hard-coded to look for the output APK at a very
 // specific location. See
 // 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)
 
+if (isNewArchitectureEnabled(project)) {
+    apply(plugin: "com.facebook.react")
+    react {
+        codegenDir = file(findNodeModulesPath("react-native-codegen", reactNativeDir))
+        reactNativeDir = reactNativeDir
+    }
+}
+
 repositories {
     maven {
         url = uri("${reactNativeDir}/android")
@@ -63,8 +67,6 @@ project.ext.react = [
     enableFlipper        : getFlipperVersion(rootDir),
     enableHermes         : true,
     enableNewArchitecture: isNewArchitectureEnabled(project),
-    codegenDir           : findNodeModulesPath("react-native-codegen", file(reactNativeDir)),
-    reactNativeDir       : reactNativeDir,
 ]
 
 project.ext.signingConfigs = getSigningConfigs()
@@ -262,8 +264,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'.")
             }