Add manifestPath userConfig.

`react-native link` often fails due to the wrong manifest being used when you use a debug manifest.
facebook · Apr 22, 2017 · 5ccb882 · 5ccb882
1 parent 03ea65e
commit 5ccb882
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/local-cli/core/__fixtures__/android.js b/local-cli/core/__fixtures__/android.js
@@ -20,6 +20,25 @@ exports.valid = {
   },
 };
 
+exports.userConfigManifest = {
+  src: {
+    main: {
+      'AndroidManifest.xml': manifest,
+      com: {
+        some: {
+          example: {
+            'Main.java': mainJavaClass,
+            'ReactPackage.java': fs.readFileSync(path.join(__dirname, './files/ReactPackage.java')),
+          },
+        },
+      },
+    },
+    debug: {
+      'AndroidManifest.xml': fs.readFileSync(path.join(__dirname, './files/AndroidManifest-debug.xml')),
+    },
+  },
+};
+
 exports.corrupted = {
   src: {
     'AndroidManifest.xml': manifest,

diff --git a/local-cli/core/__fixtures__/files/AndroidManifest-debug.xml b/local-cli/core/__fixtures__/files/AndroidManifest-debug.xml
@@ -0,0 +1,3 @@
+<manifest
+  xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>
diff --git a/local-cli/core/__tests__/android/getProjectConfig.spec.js b/local-cli/core/__tests__/android/getProjectConfig.spec.js
@@ -15,6 +15,9 @@ describe('android::getProjectConfig', () => {
     flat: {
       android: mocks.valid,
     },
+    multiple: {
+      android: mocks.userConfigManifest,
+    },
     noManifest: {
       android: {},
     },
@@ -43,6 +46,16 @@ describe('android::getProjectConfig', () => {
       expect(getProjectConfig(folder, userConfig)).not.toBe(null);
       expect(typeof getProjectConfig(folder, userConfig)).toBe('object');
     });
+
+    it('multiple', () => {
+      const userConfig = {
+        manifestPath: 'src/main/AndroidManifest.xml'
+      };
+      const folder = 'multiple';
+
+      expect(getProjectConfig(folder, userConfig)).not.toBe(null);
+      expect(typeof getProjectConfig(folder, userConfig)).toBe('object');
+    });
   });
 
   it('should return `null` if android project was not found', () => {

diff --git a/local-cli/core/android/index.js b/local-cli/core/android/index.js
@@ -29,7 +29,9 @@ exports.projectConfig = function projectConfigAndroid(folder, userConfig) {
 
   const sourceDir = path.join(folder, src);
   const isFlat = sourceDir.indexOf('app') === -1;
-  const manifestPath = findManifest(sourceDir);
+  const manifestPath = userConfig.manifestPath
+    ? path.join(sourceDir, userConfig.manifestPath)
+    : findManifest(sourceDir);
 
   if (!manifestPath) {
     return null;
@@ -97,7 +99,9 @@ exports.dependencyConfig = function dependencyConfigAndroid(folder, userConfig)
   }
 
   const sourceDir = path.join(folder, src);
-  const manifestPath = findManifest(sourceDir);
+  const manifestPath = userConfig.manifestPath
+    ? path.join(sourceDir, userConfig.manifestPath)
+    : findManifest(sourceDir);
 
   if (!manifestPath) {
     return null;