From a3545f9ef9bf5f1865e8fa6d0400e80896788b1a Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Thu, 7 Jul 2016 22:20:41 +0200
Subject: [PATCH] Link against MainApplication.java

---
 local-cli/rnpm/core/src/config/android/index.js         | 6 ++++++
 local-cli/rnpm/link/src/android/registerNativeModule.js | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/local-cli/rnpm/core/src/config/android/index.js b/local-cli/rnpm/core/src/config/android/index.js
index f8277307f1844f..5c14b0da108332 100644
--- a/local-cli/rnpm/core/src/config/android/index.js
+++ b/local-cli/rnpm/core/src/config/android/index.js
@@ -38,6 +38,11 @@ exports.projectConfig = function projectConfigAndroid(folder, userConfig) {
     userConfig.mainActivityPath || `src/main/java/${packageFolder}/MainActivity.java`
   );
 
+  const mainApplicationPath = path.join(
+    sourceDir,
+    userConfig.mainApplicationPath || `src/main/java/${packageFolder}/MainApplication.java`
+  );
+
   const stringsPath = path.join(
     sourceDir,
     userConfig.stringsPath || 'src/main/res/values/strings.xml'
@@ -69,6 +74,7 @@ exports.projectConfig = function projectConfigAndroid(folder, userConfig) {
     settingsGradlePath,
     assetsPath,
     mainActivityPath,
+    mainApplicationPath,
   };
 };
 
diff --git a/local-cli/rnpm/link/src/android/registerNativeModule.js b/local-cli/rnpm/link/src/android/registerNativeModule.js
index fa01c2081bd222..f7e585d8fcbea7 100644
--- a/local-cli/rnpm/link/src/android/registerNativeModule.js
+++ b/local-cli/rnpm/link/src/android/registerNativeModule.js
@@ -27,12 +27,12 @@ module.exports = function registerNativeAndroidModule(
   applyPatch(projectConfig.stringsPath, makeStringsPatch(params, name));
 
   applyPatch(
-    projectConfig.mainActivityPath,
+    projectConfig.mainApplicationPath,
     makePackagePatch(androidConfig.packageInstance, params, name)
   );
 
   applyPatch(
-    projectConfig.mainActivityPath,
+    projectConfig.mainApplicationPath,
     makeImportPatch(androidConfig.packageImportPath)
   );
 };