mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-31 17:32:51 +08:00
Merge branch 'master' into 4.0.x (.gitignore, create --shared)
This commit is contained in:
commit
862c223e11
2
.gitignore
vendored
2
.gitignore
vendored
@ -38,3 +38,5 @@ Desktop.ini
|
|||||||
*.iml
|
*.iml
|
||||||
.idea
|
.idea
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
|
/node_modules
|
||||||
|
/framework/build
|
||||||
|
@ -275,7 +275,7 @@ exports.createProject = function(project_path, package_name, project_name, proje
|
|||||||
copyBuildRules(project_path);
|
copyBuildRules(project_path);
|
||||||
});
|
});
|
||||||
// Link it to local android install.
|
// Link it to local android install.
|
||||||
writeProjectProperties(project_path, target_api);
|
writeProjectProperties(project_path, target_api, use_shared_project);
|
||||||
}).then(function() {
|
}).then(function() {
|
||||||
console.log('Project successfully created.');
|
console.log('Project successfully created.');
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user