Other target-dir remapping fixes

Use `startsWith` instead of `includes` to check for remapping of `target-dir` that starts with `libs` or `src/main` (Followup to PR apache#572)
brody4hire · Nov 23, 2018 · 9bd952f · 9bd952f
1 parent ef24341
commit 9bd952f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bin/templates/cordova/lib/pluginHandlers.js b/bin/templates/cordova/lib/pluginHandlers.js
@@ -303,13 +303,13 @@ function getInstallDestination (obj) {
         return path.join(APP_MAIN_PREFIX, 'java', obj.targetDir.substring(4), path.basename(obj.src));
     } else if (obj.src.endsWith('.aidl')) {
         return path.join(APP_MAIN_PREFIX, 'aidl', obj.targetDir.substring(4), path.basename(obj.src));
-    } else if (obj.targetDir.includes('libs')) {
+    } else if (obj.targetDir.startsWith('libs')) {
         if (obj.src.endsWith('.so')) {
             return path.join(APP_MAIN_PREFIX, 'jniLibs', obj.targetDir.substring(5), path.basename(obj.src));
         } else {
             return path.join('app', obj.targetDir, path.basename(obj.src));
         }
-    } else if (obj.targetDir.includes('src/main')) {
+    } else if (obj.targetDir.startsWith('src/main')) {
         return path.join('app', obj.targetDir, path.basename(obj.src));
     } else {
         // For all other source files not using the new app directory structure,