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

Fix comments in getInstallDestination (PR #550)

Browse Source 
(in pluginHandlers.js)
This commit is contained in:
Christopher J. Brody 2018-11-14 11:40:33 -05:00
parent 07e1fe18ff
commit 298f1e3cc8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,13 +321,14 @@ function getInstallDestination (obj) {
var APP_MAIN_PREFIX = 'app/src/main'; var APP_MAIN_PREFIX = 'app/src/main';
if (obj.targetDir.includes('app')) { if (obj.targetDir.includes('app')) {
// If any source file is using the app new directory structure, // If any source file is using the new app directory structure,
// don't penalize it // don't penalize it
return path.join(obj.targetDir, path.basename(obj.src)); return path.join(obj.targetDir, path.basename(obj.src));
} else if (obj.src.endsWith('.java')) { } else if (obj.src.endsWith('.java')) {
return path.join(APP_MAIN_PREFIX, '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 source files not using the new app directory structure,
// add 'app/src/main' to the targetDir
return path.join(APP_MAIN_PREFIX, obj.targetDir, path.basename(obj.src)); return path.join(APP_MAIN_PREFIX, obj.targetDir, path.basename(obj.src));
} }