Fixing merge errors.
Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/1b98e84c Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/1b98e84c Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/1b98e84c Branch: refs/heads/master Commit: 1b98e84ce2b39cd5b5ed7b9d5a2311fcb82ca3cd Parents: e59bf27 Author: Archana Naik <[email protected]> Authored: Mon Aug 18 14:46:43 2014 -0700 Committer: Archana Naik <[email protected]> Committed: Mon Aug 18 14:46:43 2014 -0700 ---------------------------------------------------------------------- bin/lib/check_reqs.js | 2 +- bin/lib/create.js | 2 +- test/AndroidManifest.xml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/1b98e84c/bin/lib/check_reqs.js ---------------------------------------------------------------------- diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js index ce71e1a..df55c1e 100644 --- a/bin/lib/check_reqs.js +++ b/bin/lib/check_reqs.js @@ -31,7 +31,7 @@ var isWindows = process.platform == 'win32'; function forgivingWhichSync(cmd) { try { - return which.sync(path); + return which.sync(cmd); } catch (e) { return ''; } http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/1b98e84c/bin/lib/create.js ---------------------------------------------------------------------- diff --git a/bin/lib/create.js b/bin/lib/create.js index b588f60..54975fe 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -249,6 +249,7 @@ exports.createProject = function(project_path, package_name, project_name, proje setShellFatal(true, function() { // copy project template shell.cp('-r', path.join(project_template_dir, 'assets'), project_path); + shell.cp('-r', path.join(project_template_dir, 'res'), project_path); shell.cp('-r', path.join(ROOT, 'framework', 'res', 'xml'), path.join(project_path, 'res')); // Manually create directories that would be empty within the template (since git doesn't track directories). @@ -261,7 +262,6 @@ exports.createProject = function(project_path, package_name, project_name, proje } // copy cordova.js, cordova.jar and res/xml - shell.cp('-r', path.join(ROOT, 'framework', 'res', 'xml'), path.join(project_path, 'res')); copyJsAndLibrary(project_path, use_shared_project, safe_activity_name); // interpolate the activity name and package http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/1b98e84c/test/AndroidManifest.xml ---------------------------------------------------------------------- diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml index bab4566..6d6caa7 100755 --- a/test/AndroidManifest.xml +++ b/test/AndroidManifest.xml @@ -300,7 +300,6 @@ android:exported="false" android:permission="org.chromium.content_shell.permission.SANDBOX" android:process=":sandboxed_process5" /> - </application> <activity android:windowSoftInputMode="adjustPan" android:label="@string/app_name"
