[4/7] cordova-lib git commit: config.xml has a different location in Android Studio

[st...@apache.org]

config.xml has a different location in Android Studio


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/a25ddc26
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/a25ddc26
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/a25ddc26

Branch: refs/heads/master
Commit: a25ddc260bbbf2aef254fb6cf91436d6edfd3ea3
Parents: 062f15f
Author: Anis Kadri <an...@apache.org>
Authored: Mon Aug 29 16:28:55 2016 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 14 16:49:10 2016 -0700

----------------------------------------------------------------------
 cordova-common/src/ConfigChanges/ConfigFile.js | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a25ddc26/cordova-common/src/ConfigChanges/ConfigFile.js
----------------------------------------------------------------------
diff --git a/cordova-common/src/ConfigChanges/ConfigFile.js b/cordova-common/src/ConfigChanges/ConfigFile.js
index 179d54d..5170581 100644
--- a/cordova-common/src/ConfigChanges/ConfigFile.js
+++ b/cordova-common/src/ConfigChanges/ConfigFile.js
@@ -193,6 +193,11 @@ function resolveConfigFilePath(project_dir, platform, file) {
         return filepath;
     }
 
+    // FIXME android studio
+    if(platform === "android" && !fs.existsSync(filepath)) {
+      filepath = path.join(project_dir, 'app', 'src', 'main', 'res', 'xml', 'config.xml');
+    }
+
     // None of the special cases matched, returning project_dir/file.
     return filepath;
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org