You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/04/09 17:30:18 UTC
[2/2] android commit: CB-8834 Don't fail to install on
VERSION_DOWNGRADE
CB-8834 Don't fail to install on VERSION_DOWNGRADE
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f224b1f2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f224b1f2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f224b1f2
Branch: refs/heads/4.0.x
Commit: f224b1f2d4d22f4eabb7434140ee16daad34165e
Parents: 4ac6916
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Apr 9 11:28:55 2015 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Apr 9 11:29:18 2015 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/device.js | 2 +-
bin/templates/cordova/lib/emulator.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f224b1f2/bin/templates/cordova/lib/device.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/device.js b/bin/templates/cordova/lib/device.js
index c13fdc4..069f5ad 100644
--- a/bin/templates/cordova/lib/device.js
+++ b/bin/templates/cordova/lib/device.js
@@ -98,7 +98,7 @@ module.exports.install = function(target, buildResults) {
var launchName = appinfo.getActivityName();
console.log('Using apk: ' + apk_path);
console.log('Installing app on device...');
- var cmd = 'adb -s ' + resolvedTarget.target + ' install -r "' + apk_path + '"';
+ var cmd = 'adb -s ' + resolvedTarget.target + ' install -r -d "' + apk_path + '"';
return exec(cmd, os.tmpdir())
.then(function(output) {
if (output.match(/Failure/)) return Q.reject('ERROR: Failed to install apk to device: ' + output);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f224b1f2/bin/templates/cordova/lib/emulator.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js
index 367ae56..5e79152 100644
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -308,7 +308,7 @@ module.exports.install = function(target, buildResults) {
var apk_path = build.findBestApkForArchitecture(buildResults, resolvedTarget.arch);
console.log('Installing app on emulator...');
console.log('Using apk: ' + apk_path);
- return exec('adb -s ' + resolvedTarget.target + ' install -r "' + apk_path + '"', os.tmpdir())
+ return exec('adb -s ' + resolvedTarget.target + ' install -r -d "' + apk_path + '"', os.tmpdir())
.then(function(output) {
if (output.match(/Failure/)) {
return Q.reject('Failed to install apk to emulator: ' + output);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org