mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-31 17:32:51 +08:00
Fixing error caused by merge commit
This commit is contained in:
parent
46905ebe99
commit
e91b19d006
2
bin/templates/cordova/lib/prepare.js
vendored
2
bin/templates/cordova/lib/prepare.js
vendored
@ -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);
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user