public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Cleanup getInstallDestination in pluginHandlers.js

Browse Source
This commit is contained in:
Christopher J. Brody 2018-11-14 11:38:39 -05:00
parent bbb3913a36
commit 21f84732c8
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/templates/cordova/lib/pluginHandlers.js vendored
View File

@ -293,20 +293,17 @@ function generateAttributeError (attribute, element, id) {
} }
function getInstallDestination (obj) { function getInstallDestination (obj) {
return studioPathRemap(obj) || var APP_MAIN_PREFIX = 'app/src/main';
path.join(obj.targetDir, path.basename(obj.src));
}
function studioPathRemap (obj) { if (obj.targetDir.includes('app')) {
// If any source file is using the app new directory structure, // If any source file is using the app new directory structure,
// don't penalize it // don't penalize it
if (!obj.targetDir.includes('app')) { return path.join(obj.targetDir, path.basename(obj.src));
if (obj.src.endsWith('.java')) { } else if (obj.src.endsWith('.java')) {
return path.join('app/src/main/java', obj.targetDir.substring(4), path.basename(obj.src)); return path.join(APP_MAIN_PREFIX, 'java', obj.targetDir.substring(4), path.basename(obj.src));
} else { } else {
// For all other files, add 'app/src/main' to the targetDir if it didn't have it already // For all other files, add 'app/src/main' to the targetDir if it didn't have it already
return path.join('app/src/main', obj.targetDir, path.basename(obj.src)); return path.join(APP_MAIN_PREFIX, obj.targetDir, path.basename(obj.src));
}
} }
} }