You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ni...@apache.org on 2016/01/19 21:07:00 UTC
[1/2] android commit: CB-10386 Add android.useDeprecatedNdk=true to
support NDK in gradle
Repository: cordova-android
Updated Branches:
refs/heads/master 11760afdd -> ada35e0e0
CB-10386 Add android.useDeprecatedNdk=true to support NDK in gradle
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/fc778006
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/fc778006
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/fc778006
Branch: refs/heads/master
Commit: fc778006effd47909f4e019bbac2b5b734de3df4
Parents: 11760af
Author: Nikhil Khandelwal <ni...@microsoft.com>
Authored: Tue Jan 19 11:16:04 2016 -0800
Committer: Nikhil Khandelwal <ni...@microsoft.com>
Committed: Tue Jan 19 11:36:39 2016 -0800
----------------------------------------------------------------------
bin/templates/cordova/lib/builders/GradleBuilder.js | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fc778006/bin/templates/cordova/lib/builders/GradleBuilder.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/builders/GradleBuilder.js b/bin/templates/cordova/lib/builders/GradleBuilder.js
index 8dea4bf..0593f9b 100644
--- a/bin/templates/cordova/lib/builders/GradleBuilder.js
+++ b/bin/templates/cordova/lib/builders/GradleBuilder.js
@@ -56,6 +56,8 @@ GradleBuilder.prototype.getArgs = function(cmd, opts) {
// 10 seconds -> 6 seconds
args.push('-Dorg.gradle.daemon=true');
+ // allow NDK to be used - required by Gradle 1.5 plugin
+ args.push('-Pandroid.useDeprecatedNdk=true');
args.push.apply(args, opts.extraArgs);
// Shaves another 100ms, but produces a "try at own risk" warning. Not worth it (yet):
// args.push('-Dorg.gradle.parallel=true');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] android commit: Fix jshint issues
Posted by ni...@apache.org.
Fix jshint issues
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ada35e0e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ada35e0e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ada35e0e
Branch: refs/heads/master
Commit: ada35e0e00bf3178a38c08e5b419f0d3bf825eae
Parents: fc77800
Author: Nikhil Khandelwal <ni...@microsoft.com>
Authored: Tue Jan 19 12:01:44 2016 -0800
Committer: Nikhil Khandelwal <ni...@microsoft.com>
Committed: Tue Jan 19 12:01:44 2016 -0800
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ada35e0e/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 694783f..47aaa16 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -94,8 +94,9 @@ function parseOpts(options, resolvedTarget) {
if (config.android && config.android[ret.buildType]) {
var androidInfo = config.android[ret.buildType];
if(androidInfo.keystore && !packageArgs.keystore) {
- if(androidInfo.keystore.substr(0,1) === '~')
- androidInfo.keystore = process.env.HOME + androidInfo.keystore.substr(1)
+ if(androidInfo.keystore.substr(0,1) === '~') {
+ androidInfo.keystore = process.env.HOME + androidInfo.keystore.substr(1);
+ }
packageArgs.keystore = path.resolve(path.dirname(buildConfig), androidInfo.keystore);
events.emit('log', 'Reading the keystore from: ' + packageArgs.keystore);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org