You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2015/09/28 11:32:03 UTC
android commit: CB-9080 Cordova CLI run for Android versions 4.1.1
and lower throws error
Repository: cordova-android
Updated Branches:
refs/heads/master bf57aa1df -> afa61aeb0
CB-9080 Cordova CLI run for Android versions 4.1.1 and lower throws error
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/afa61aeb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/afa61aeb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/afa61aeb
Branch: refs/heads/master
Commit: afa61aeb0915fd4334d266bdfee759ab9bbb52db
Parents: bf57aa1
Author: daserge <v-...@microsoft.com>
Authored: Wed Sep 23 18:44:41 2015 +0300
Committer: daserge <v-...@microsoft.com>
Committed: Wed Sep 23 18:44:41 2015 +0300
----------------------------------------------------------------------
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/afa61aeb/bin/templates/cordova/lib/device.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/device.js b/bin/templates/cordova/lib/device.js
index 560f26d..f0d6f89 100644
--- a/bin/templates/cordova/lib/device.js
+++ b/bin/templates/cordova/lib/device.js
@@ -104,7 +104,7 @@ module.exports.install = function(target, buildResults) {
return exec('adb -s ' + resolvedTarget.target + ' uninstall ' + pkgName, os.tmpdir())
.then(function() {
console.log('Installing app on device...');
- var cmd = 'adb -s ' + resolvedTarget.target + ' install -r -d "' + apk_path + '"';
+ var cmd = 'adb -s ' + resolvedTarget.target + ' install -r "' + apk_path + '"';
return exec(cmd, os.tmpdir());
})
.then(function(output) {
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/afa61aeb/bin/templates/cordova/lib/emulator.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js
index a27d0d3..4e58c92 100644
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -344,7 +344,7 @@ module.exports.install = function(givenTarget, buildResults) {
var retriedInstall = retry.retryPromise(
NUM_INSTALL_RETRIES,
- exec, 'adb -s ' + target.target + ' install -r -d "' + apk_path + '"', os.tmpdir(), execOptions
+ exec, 'adb -s ' + target.target + ' install -r "' + apk_path + '"', os.tmpdir(), execOptions
);
return retriedInstall.then(function (output) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org