From e91b19d006d5c2d57c4757e4c02e81f889515288 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Mon, 31 Jul 2017 14:10:14 -0700
Subject: [PATCH] Fixing error caused by merge commit

---
 bin/templates/cordova/lib/prepare.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js
index 07404fca..53ad5107 100644
--- a/bin/templates/cordova/lib/prepare.js
+++ b/bin/templates/cordova/lib/prepare.js
@@ -200,7 +200,7 @@ function updateProjectAccordingTo (platformConfig, locations) {
         .write();
 
     // Java file paths shouldn't be hard coded
-    var javaPattern = path.join(locations.javaSrc, orig_pkg.replace(/\./g, '/'), '*.java');
+    var javaPattern = path.join(locations.javaSrc, manifestId.replace(/\./g, '/'), '*.java');
     var java_files = shell.ls(javaPattern).filter(function (f) {
         return shell.grep(/extends\s+CordovaActivity/g, f);
     });