From b15a2c3fc13d9afd6a800df825c7aba7c718d789 Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@meta.com>
Date: Wed, 13 Sep 2023 08:56:22 -0700
Subject: [PATCH] Unblock `yarn android` on main (#39413)

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

`yarn android` on main is currently broken due to the CLI attempting to search for the manifest inside the src/androidTest folder.
This fixes it by specifying the exact path of the Android Manifest.
The fix to the CLI is also pending to prevent the CLI from searching inside test folders.

Fix for the CLI is here:
- https://github.com/react-native-community/cli/pull/2075

Changelog:
[Internal] [Changed] - Unblock `yarn android` on main

Reviewed By: huntie

Differential Revision: D49190626

fbshipit-source-id: 99309f17cb08a33be2a565f5faa29130862686ea
---
 packages/rn-tester/package.json           | 2 +-
 packages/rn-tester/react-native.config.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/rn-tester/package.json b/packages/rn-tester/package.json
index 2adbba48dd3..d63abf26aab 100644
--- a/packages/rn-tester/package.json
+++ b/packages/rn-tester/package.json
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "start": "react-native start",
-    "android": "react-native run-android --mode HermesDebug --appId 'com.facebook.react.uiapp' --main-activity 'com.facebook.react.uiapp.RNTesterActivity'",
+    "android": "react-native run-android --mode HermesDebug",
     "install-android-jsc": "../../gradlew :packages:rn-tester:android:app:installJscDebug",
     "install-android-hermes": "../../gradlew :packages:rn-tester:android:app:installHermesDebug",
     "clean-android": "rm -rf android/app/build",
diff --git a/packages/rn-tester/react-native.config.js b/packages/rn-tester/react-native.config.js
index f88c60aa4a4..449669b10b9 100644
--- a/packages/rn-tester/react-native.config.js
+++ b/packages/rn-tester/react-native.config.js
@@ -26,6 +26,10 @@ module.exports = {
     },
     android: {
       sourceDir: '../../',
+      // To remove once the CLI fix for manifestPath search path is landed.
+      manifestPath:
+        'packages/rn-tester/android/app/src/main/AndroidManifest.xml',
+      packageName: 'com.facebook.react.uiapp',
     },
   },
 };