Merge pull request #8875 from sgtcoolguy/TIMOB-24470

Fix [TIMOB-24470] Android: Fails to build modules that contain additi…
tidev · Mar 10, 2017 · 1cadb4d · 1cadb4d
2 parents 32a6b1e + 9a6a569
commit 1cadb4d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/android/cli/commands/_buildModule.js b/android/cli/commands/_buildModule.js
@@ -1177,7 +1177,7 @@ AndroidModuleBuilder.prototype.ndkLocalBuild = function (next) {
 };
 
 AndroidModuleBuilder.prototype.compileAllFinal = function (next) {
-	this.logger.log(__('Compiling all java source files genereated'));
+	this.logger.log(__('Compiling all java source files generated'));
 
 	var javaSourcesFile = path.join(this.projectDir, 'java-sources.txt'),
 		javaFiles = [],
@@ -1196,7 +1196,13 @@ AndroidModuleBuilder.prototype.compileAllFinal = function (next) {
 		}.bind(this));
 	});
 
-	this.dirWalker(this.projectDir, function (file) {
+	this.dirWalker(this.javaSrcDir, function (file) {
+		if (path.extname(file) === '.java') {
+			javaFiles.push(file);
+		}
+	}.bind(this));
+
+	this.dirWalker(this.buildGenDir, function (file) {
 		if (path.extname(file) === '.java') {
 			javaFiles.push(file);
 		}