github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-07 23:03:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup getInstallDestination in pluginHandlers.js (PR #550)

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

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

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