github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-04 00:02:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (gradlify tests)

Browse Source 
Conflicts:
	test/androidTest/src/org/apache/cordova/test/junit/MenuTest.java
This commit is contained in:
Andrew Grieve
2015-01-20 14:55:44 -05:00
parent 587488a1b1 9e04eec9dd
commit c352b296da
107 changed files with 191 additions and 7921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/lib/check_reqs.js
+5 -1
View File
@@ -237,6 +237,10 @@ module.exports.check_android_target = function(valid_target) {
// Returns a promise.
module.exports.run = function() {
return Q.all([this.check_java(), this.check_android()]);
return Q.all([this.check_java(), this.check_android()])
.then(function() {
console.log('ANDROID_HOME=' + process.env['ANDROID_HOME']);
console.log('JAVA_HOME=' + process.env['JAVA_HOME']);
});
}
bin/lib/create.js
+1 -1
View File
@@ -72,6 +72,7 @@ function copyJsAndLibrary(projectPath, shared, projectName) {
shell.cp('-f', path.join(ROOT, 'framework', 'AndroidManifest.xml'), nestedCordovaLibPath);
shell.cp('-f', path.join(ROOT, 'framework', 'project.properties'), nestedCordovaLibPath);
shell.cp('-f', path.join(ROOT, 'framework', 'build.gradle'), nestedCordovaLibPath);
shell.cp('-f', path.join(ROOT, 'framework', 'cordova.gradle'), nestedCordovaLibPath);
shell.cp('-r', path.join(ROOT, 'framework', 'src'), nestedCordovaLibPath);
// Create an eclipse project file and set the name of it to something unique.
// Without this, you can't import multiple CordovaLib projects into the same workspace.
@@ -121,7 +122,6 @@ function copyBuildRules(projectPath) {
var srcDir = path.join(ROOT, 'bin', 'templates', 'project');
shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
shell.cp('-f', path.join(srcDir, 'cordova.gradle'), projectPath);
}
function copyScripts(projectPath) {