updated bundled cordova-common to 1.4.1

Set VERSION to 5.2.2 (via coho)
Update JS snapshot to version 5.2.2 (via coho)
2026-01-30 00:05:28 +08:00 · 2016-08-17 10:05:02 -07:00 · 2016-07-26 14:57:28 -07:00 · 2016-07-26 14:57:28 -07:00 · 2016-07-26 13:25:19 -07:00 · 2016-07-26 13:23:45 -07:00
877 changed files with 90181 additions and 2200 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,94 @@
+* text eol=lf
+
+# source code
+*.php text
+*.css text
+*.sass text
+*.scss text
+*.less text
+*.styl text
+*.js text
+*.coffee text
+*.json text
+*.htm text
+*.html text
+*.xml text
+*.svg text
+*.txt text
+*.ini text
+*.inc text
+*.pl text
+*.rb text
+*.py text
+*.scm text
+*.sql text
+*.sh text
+*.bat text
+
+# templates
+*.ejs text
+*.hbt text
+*.jade text
+*.haml text
+*.hbs text
+*.dot text
+*.tmpl text
+*.phtml text
+
+# server config
+.htaccess text
+
+# git config
+.gitattributes text
+.gitignore text
+.gitconfig text
+
+# code analysis config
+.jshintrc text
+.jscsrc text
+.jshintignore text
+.csslintrc text
+
+# misc config
+*.yaml text
+*.yml text
+.editorconfig text
+
+# build config
+*.npmignore text
+*.bowerrc text
+
+# Heroku
+Procfile text
+.slugignore text
+
+# Documentation
+*.md text
+LICENSE text
+AUTHORS text
+
+
+#
+## These files are binary and should be left untouched
+#
+
+# (binary is a macro for -text -diff)
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.mov binary
+*.mp4 binary
+*.mp3 binary
+*.flv binary
+*.fla binary
+*.swf binary
+*.gz binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.eot binary
+*.woff binary
+*.pyc binary
+*.pdf binary
--- a/.gitignore
+++ b/.gitignore
@@ -35,9 +35,98 @@ Desktop.ini
 *.swp
 *.class
 *.jar
+!/spec/fixtures/org.test.plugins.dummyplugin/src/android/TestLib.jar
 # IntelliJ IDEA files
 *.iml
 .idea
 npm-debug.log
-/node_modules
 /framework/build
+node_modules/jshint
+node_modules/promise-matchers
+node_modules/jasmine-node
+node_modules/rewire
+node_modules/istanbul
+node_modules/.bin/cake
+node_modules/.bin/coffee
+node_modules/.bin/escodegen
+node_modules/.bin/esgenerate
+node_modules/.bin/esparse
+node_modules/.bin/esvalidate
+node_modules/.bin/handlebars
+node_modules/.bin/istanbul
+node_modules/.bin/jasmine-node
+node_modules/.bin/js-yaml
+node_modules/.bin/jshint
+node_modules/.bin/mkdirp
+node_modules/.bin/r.js
+node_modules/.bin/r_js
+node_modules/.bin/strip-json-comments
+node_modules/.bin/uglifyjs
+node_modules/.bin/which
+node_modules/align-text/
+node_modules/amdefine/
+node_modules/argparse/
+node_modules/async/
+node_modules/camelcase/
+node_modules/center-align/
+node_modules/cli/
+node_modules/cliui/
+node_modules/coffee-script/
+node_modules/console-browserify/
+node_modules/core-util-is/
+node_modules/date-now/
+node_modules/decamelize/
+node_modules/deep-is/
+node_modules/dom-serializer/
+node_modules/domelementtype/
+node_modules/domhandler/
+node_modules/domutils/
+node_modules/entities/
+node_modules/escodegen/
+node_modules/esprima/
+node_modules/estraverse/
+node_modules/esutils/
+node_modules/exit/
+node_modules/fast-levenshtein/
+node_modules/fileset/
+node_modules/gaze/
+node_modules/growl/
+node_modules/handlebars/
+node_modules/has-flag/
+node_modules/htmlparser2/
+node_modules/is-buffer/
+node_modules/isarray/
+node_modules/isexe/
+node_modules/jasmine-growl-reporter/
+node_modules/jasmine-reporters/
+node_modules/js-yaml/
+node_modules/kind-of/
+node_modules/lazy-cache/
+node_modules/levn/
+node_modules/longest/
+node_modules/lru-cache/
+node_modules/minimist/
+node_modules/mkdirp/
+node_modules/optimist/
+node_modules/optionator/
+node_modules/prelude-ls/
+node_modules/readable-stream/
+node_modules/repeat-string/
+node_modules/requirejs/
+node_modules/resolve/
+node_modules/right-align/
+node_modules/sigmund/
+node_modules/source-map/
+node_modules/sprintf-js/
+node_modules/string_decoder/
+node_modules/strip-json-comments/
+node_modules/supports-color/
+node_modules/type-check/
+node_modules/uglify-js/
+node_modules/uglify-to-browserify/
+node_modules/walkdir/
+node_modules/which/
+node_modules/window-size/
+node_modules/wordwrap/
+node_modules/yargs/
+/coverage
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,2 +1,3 @@
 bin/node_modules/*
 bin/templates/project/*
+spec/fixtures/*
--- a/.ratignore
+++ b/.ratignore
@@ -2,3 +2,5 @@
 bin
 gen
 proguard-project.txt
+spec
+appveyor.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,11 @@ language: android
 sudo: false
 install:
    - npm install
-    - echo y | android update sdk -u --filter android-22
+    - npm install -g codecov
+    - echo y | android update sdk -u --filter android-22,android-23
 script:
-    - npm test
-    - npm run test-build
+    - npm run jshint
+    - npm run cover
+    - npm run test-build
+after_script:
+    - codecov
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ There are multiple ways to contribute: report bugs, improve the docs, and
 contribute code.
  
 For instructions on this, start with the
-[contribution overview](http://cordova.apache.org/#contribute).
+[contribution overview](http://cordova.apache.org/contribute/).

 The details are explained there, but the important items are:
 - Sign and submit an Apache ICLA (Contributor License Agreement).
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-
+
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 Apache Cordova
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation

 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org)
--- a/README.md
+++ b/README.md
@@ -18,6 +18,11 @@
 # under the License.
 #
 -->
+
+[![Build status](https://ci.appveyor.com/api/projects/status/github/apache/cordova-android?branch=master)](https://ci.appveyor.com/project/Humbedooh/cordova-android)
+[![Build Status](https://travis-ci.org/apache/cordova-android.svg?branch=master)](https://travis-ci.org/apache/cordova-android)
+[![codecov.io](https://codecov.io/github/apache/cordova-android/coverage.svg?branch=master)](https://codecov.io/github/apache/cordova-android?branch=master)
+
 # Cordova Android

 Cordova Android is an Android application library that allows for Cordova-based
@@ -26,6 +31,8 @@ at the core, applications written with web technology: HTML, CSS and JavaScript.

 [Apache Cordova](https://cordova.apache.org) is a project of The Apache Software Foundation (ASF).

+:warning: Report issues on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Android%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
+

 ## Requires

@@ -55,4 +62,3 @@ These commands live in a generated Cordova Android project. Any interactions wit

 1. Create a project
 2. Import it via "Non-Android Studio Project"
-
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -19,67 +19,172 @@
 #
 -->
 ## Release Notes for Cordova (Android) ##
-Update these notes using: git log --pretty=format:'* %s' --topo-order --no-merges *remote*/4.1.x...HEAD
+
+### 5.2.2 (Jul 26, 2016)
+* [CB-11615](https://issues.apache.org/jira/browse/CB-11615) updated `cordoova-common` to `1.4.0`
+
+### 5.2.1 (Jul 11, 2016)
+* [CB-9489](https://issues.apache.org/jira/browse/CB-9489) Fixed "endless waiting for emulator" issue
+* [CB-11481](https://issues.apache.org/jira/browse/CB-11481) android-library is deprecated use com.android.library instead
+
+### 5.2.0 (Jun 29, 2016)
+* [CB-11383](https://issues.apache.org/jira/browse/CB-11383) Update to gradle for using `jcenter` and correct Application plugin
+* [CB-11365](https://issues.apache.org/jira/browse/CB-11365) fixed plugin rm issue with emit being `undefined`
+* [CB-11117](https://issues.apache.org/jira/browse/CB-11117) Use `FileUpdater` to optimize prepare for **android** platform
+* [CB-10096](https://issues.apache.org/jira/browse/CB-10096) Upgrade test project to `Gradle Plugin 2.1.0`
+* [CB-11292](https://issues.apache.org/jira/browse/CB-11292) fix broken `MessageChannel` after plugins are recreated
+* [CB-11259](https://issues.apache.org/jira/browse/CB-11259) Improving build output
+* [CB-10096](https://issues.apache.org/jira/browse/CB-10096) Upgrading to `Gradle Plugin 2.1.0`
+* [CB-11198](https://issues.apache.org/jira/browse/CB-11198) Skip **android** target sdk check. This closes #303.
+* [CB-11138](https://issues.apache.org/jira/browse/CB-11138) Reuse `PluginManager` from `common` to add/rm plugins
+* [CB-11133](https://issues.apache.org/jira/browse/CB-11133) Handle **android** emulator start failure
+* [CB-11132](https://issues.apache.org/jira/browse/CB-11132) Fix Error: Cannot read property `match` of undefined in `cordova-android` `emulator.js`
+* Add simple log for package name being deployed
+* [CB-11015](https://issues.apache.org/jira/browse/CB-11015) Error adding plugin with gradle extras
+* [CB-11095](https://issues.apache.org/jira/browse/CB-11095) Fix plugin add/removal when running on `Node v.010`
+* [CB-11022](https://issues.apache.org/jira/browse/CB-11022) Duplicate www files to both destinations on plugin operations
+* [CB-10964](https://issues.apache.org/jira/browse/CB-10964) Handle `build.json` file starting with a BOM.
+* [CB-10963](https://issues.apache.org/jira/browse/CB-10963) Handle overlapping permission requests from plugins
+* [CB-8582](https://issues.apache.org/jira/browse/CB-8582) Obscure `INSTALL_FAILED_VERSION_DOWNGRADE` error when installing app
+* [CB-10862](https://issues.apache.org/jira/browse/CB-10862) Cannot set `minsdkversion`
+* [CB-10896](https://issues.apache.org/jira/browse/CB-10896) We never enabled cookies on the `WebView` proper
+* [CB-10837](https://issues.apache.org/jira/browse/CB-10837) Support platform-specific orientation on **Android**
+* [CB-10600](https://issues.apache.org/jira/browse/CB-10600) `cordova run android --release` does not use signed and zip-aligned version of `APK`
+* [CB-9710](https://issues.apache.org/jira/browse/CB-9710) Fixing issues parsing `android avd list` output for certain AVDs which resulted in them not being included in the selection process even if they are the best match.
+* [CB-10888](https://issues.apache.org/jira/browse/CB-10888) Enable coverage reports collection via codecov
+* [CB-10846](https://issues.apache.org/jira/browse/CB-10846) Add Travis and AppVeyor badges to readme
+* [CB-10846](https://issues.apache.org/jira/browse/CB-10846) Add AppVeyor configuration
+* [CB-10749](https://issues.apache.org/jira/browse/CB-10749) Use `cordova-common.CordovaLogger` in `cordova-android`
+* [CB-10673](https://issues.apache.org/jira/browse/CB-10673) fixed conflicting plugin install issue with overlapped `<source-file>` tag. Add `--force` flag.
+* [CB-8976](https://issues.apache.org/jira/browse/CB-8976) Removing the auto-version for non-Crosswalk applications
+* [CB-10768](https://issues.apache.org/jira/browse/CB-10768) Use `cordova-common.superspawn` in `GradleBuilder`
+* [CB-10729](https://issues.apache.org/jira/browse/CB-10729) Move plugin handlers tests for into platform's repo
+* [CB-10669](https://issues.apache.org/jira/browse/CB-10669) `cordova run --list` cannot find `adb`
+* [CB-10660](https://issues.apache.org/jira/browse/CB-10660) fixed the exception when removing a non-existing directory.
+
+### 5.1.1 (Feb 24, 2016)
+* updated `cordova-common` dependnecy to `1.1.0`
+* [CB-10628](https://issues.apache.org/jira/browse/CB-10628) Fix `emulate android --target`
+* [CB-10618](https://issues.apache.org/jira/browse/CB-10618) Handle gradle frameworks on plugin installation/uninstallation
+* [CB-10510](https://issues.apache.org/jira/browse/CB-10510) Add an optional timeout to `emu` start script
+* [CB-10498](https://issues.apache.org/jira/browse/CB-10498) Resume event should be sticky if it has a plugin result
+* fix `HtmlNotFoundTest` so that it passes when file not found is handled correctly
+* [CB-10472](https://issues.apache.org/jira/browse/CB-10472) `NullPointerException`: `org.apache.cordova.PluginManager.onSaveInstanceState` check if `pluginManager` is `null` before using it
+* [CB-10138](https://issues.apache.org/jira/browse/CB-10138) Adds missing plugin metadata to `plugin_list` module.
+* [CB-10443](https://issues.apache.org/jira/browse/CB-10443) Pass original options instead of remaining
+* [CB-10443](https://issues.apache.org/jira/browse/CB-10443) Fix `this.root` null reference
+* [CB-10421](https://issues.apache.org/jira/browse/CB-10421) Fixes exception when calling run script with `--help` option
+* updated `.gitignore`
+* [CB-10406](https://issues.apache.org/jira/browse/CB-10406) Fixes an exception, thrown when building using Ant.
+* [CB-10157](https://issues.apache.org/jira/browse/CB-10157) Uninstall app from device/emulator only when signed apk is already installed
+
+### 5.1.0 (Jan 19, 2016)
+* [CB-10386](https://issues.apache.org/jira/browse/CB-10386) Add `android.useDeprecatedNdk=true` to support `NDK` in `gradle`
+* [CB-8864](https://issues.apache.org/jira/browse/CB-8864) Fixing this to mitigate [CB-8685](https://issues.apache.org/jira/browse/CB-8685) and [CB-10104](https://issues.apache.org/jira/browse/CB-10104)
+* [CB-10105](https://issues.apache.org/jira/browse/CB-10105) Spot fix for tilde errors on paths.
+* Update theme to `Theme.DeviceDefault.NoActionBar`
+* [CB-10014](https://issues.apache.org/jira/browse/CB-10014) Set gradle `applicationId` to `package name`.
+* [CB-9949](https://issues.apache.org/jira/browse/CB-9949) Fixing menu button event not fired in **Android**
+* [CB-9479](https://issues.apache.org/jira/browse/CB-9479) Fixing the conditionals again, we should
+* [CB-8917](https://issues.apache.org/jira/browse/CB-8917) New Plugin API for passing results on resume after Activity destruction
+* [CB-9971](https://issues.apache.org/jira/browse/CB-9971) Suppress `gradlew _JAVA_OPTIONS` output during build
+* [CB-9836](https://issues.apache.org/jira/browse/CB-9836) Add `.gitattributes` to prevent `CRLF` line endings in repos
+* added node_modules back into `.gitignore`
+
+### 5.0.0 (Nov 01, 2015)
+* Update CordovaWebViewEngine.java
+* [CB-9909](https://issues.apache.org/jira/browse/CB-9909) Shouldn't escape spaces in paths on Windows.
+* [CB-9870](https://issues.apache.org/jira/browse/CB-9870) updated hello world template
+* [CB-9880](https://issues.apache.org/jira/browse/CB-9880) Fixes platform update failure when upgrading from android@<4.1.0
+* [CB-9844](https://issues.apache.org/jira/browse/CB-9844) Remove old .java after renaming activity
+* [CB-9800](https://issues.apache.org/jira/browse/CB-9800) Fixing contribute link.
+* [CB-9782](https://issues.apache.org/jira/browse/CB-9782) Check in `cordova-common` dependency
+* Adds licence header to Adb to pass rat audit
+* [CB-9835](https://issues.apache.org/jira/browse/CB-9835) Downgrade `properties-parser` to prevent failures in Node < 4.x
+* [CB-9782](https://issues.apache.org/jira/browse/CB-9782) Implements PlatformApi contract for Android platform.
+* [CB-9826](https://issues.apache.org/jira/browse/CB-9826) Fixed `test-build` script on windows.
+* Refactor of the Cordova Plugin/Permissions API
+* Manually updating version to 5.0.0-dev for engine tags
+* Bump up to API level 23
+* Commiting code to handle permissions, and the special case of the Geolocation Plugin
+* [CB-9608](https://issues.apache.org/jira/browse/CB-9608) cordova-android no longer builds on Node 0.10 or below
+* [CB-9080](https://issues.apache.org/jira/browse/CB-9080) Cordova CLI run for Android versions 4.1.1 and lower throws error
+* [CB-9557](https://issues.apache.org/jira/browse/CB-9557) Fixes apk install failure when switching from debug to release build
+* [CB-9496](https://issues.apache.org/jira/browse/CB-9496) removed permissions added for crosswalk
+* [CB-9402](https://issues.apache.org/jira/browse/CB-9402) Allow to set gradle distubutionUrl via env variable CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL
+* [CB-9428](https://issues.apache.org/jira/browse/CB-9428) update script now bumps up minSdkVersion to 14 if it is less than that.
+* [CB-9430](https://issues.apache.org/jira/browse/CB-9430) Fixes check_reqs failure when javac returns an extra line
+* [CB-9172](https://issues.apache.org/jira/browse/CB-9172) Improved emulator deploy stability. This closes #188.
+* [CB-9404](https://issues.apache.org/jira/browse/CB-9404) Fixed an exception when path contained -debug or -release
+* [CB-8320](https://issues.apache.org/jira/browse/CB-8320) Setting up gradle so we can use CordovaLib as a standard Android Library
+* [CB-9185](https://issues.apache.org/jira/browse/CB-9185) Fixed an issue when unsigned apks couldn't be found.
+* [CB-9397](https://issues.apache.org/jira/browse/CB-9397) Fixes minor issues with `cordova requirements android`
+* [CB-9389](https://issues.apache.org/jira/browse/CB-9389) Fixes build/check_reqs hang
+
+### Release 4.1.1 (Aug 2015) ###
+
+* [CB-9428](https://issues.apache.org/jira/browse/CB-9428) update script now bumps up minSdkVersion to 14 if it is less than that
+* [CB-9430](https://issues.apache.org/jira/browse/CB-9430) Fixes check_reqs failure when javac returns an extra line

 ### Release 4.1.0 (Jul 2015) ###
-* CB-9392 Fixed printing flavored versions. This closes #184.
-* CB-9382 [Android] Fix KeepRunning setting when Plugin activity is showed. This closes #200
-* CB-9391 Fixes cdvBuildMultipleApks option casting
-* CB-9343 Split the Content-Type to obtain a clean mimetype
-* CB-9255 Make getUriType case insensitive.
-* CB-9149 Fixes JSHint issue introduced by 899daa9
-* CB-9372: Remove unused files: 'main.js' & 'master.css'. This closes #198
-* CB-9149 Make gradle alias subprojects in order to handle libs that depend on libs. This closes #182
+* [CB-9392](https://issues.apache.org/jira/browse/CB-9392) Fixed printing flavored versions. This closes #184.
+* [CB-9382](https://issues.apache.org/jira/browse/CB-9382) [Android] Fix KeepRunning setting when Plugin activity is showed. This closes #200
+* [CB-9391](https://issues.apache.org/jira/browse/CB-9391) Fixes cdvBuildMultipleApks option casting
+* [CB-9343](https://issues.apache.org/jira/browse/CB-9343) Split the Content-Type to obtain a clean mimetype
+* [CB-9255](https://issues.apache.org/jira/browse/CB-9255) Make getUriType case insensitive.
+* [CB-9149](https://issues.apache.org/jira/browse/CB-9149) Fixes JSHint issue introduced by 899daa9
+* [CB-9372](https://issues.apache.org/jira/browse/CB-9372) Remove unused files: 'main.js' & 'master.css'. This closes #198
+* [CB-9149](https://issues.apache.org/jira/browse/CB-9149) Make gradle alias subprojects in order to handle libs that depend on libs. This closes #182
 * Update min SDK version to 14
 * Update licenses. This closes #190
-* CB-9185 Fix signed release build exception. This closes #193.
-* CB-9286 Fixes build failure when ANDROID_HOME is not set.
-* CB-9284 Fix for handling absolute path for keystore in build.json
-* CB-9260 Install Android-22 on Travis-CI
+* [CB-9185](https://issues.apache.org/jira/browse/CB-9185) Fix signed release build exception. This closes #193.
+* [CB-9286](https://issues.apache.org/jira/browse/CB-9286) Fixes build failure when ANDROID_HOME is not set.
+* [CB-9284](https://issues.apache.org/jira/browse/CB-9284) Fix for handling absolute path for keystore in build.json
+* [CB-9260](https://issues.apache.org/jira/browse/CB-9260) Install Android-22 on Travis-CI
 * Adding .ratignore file.
-* CB-9119 Adding lib/retry.js for retrying promise-returning functions. Retrying 'adb install' in emulator.js because it sometimes hangs.
-* CB-9115 android: Grant Lollipop permission req
+* [CB-9119](https://issues.apache.org/jira/browse/CB-9119) Adding lib/retry.js for retrying promise-returning functions. Retrying 'adb install' in emulator.js because it sometimes hangs.
+* [CB-9115](https://issues.apache.org/jira/browse/CB-9115) android: Grant Lollipop permission req
 * Remove extra console message
-* CB-8898 Report expected gradle location properly
-* CB-8898 Fixes gradle check failure due to missing quotes
-* CB-9080: -d option is not supported on Android 4.1.1 and lower, removing
-* CB-8954 Adds `requirements` command support to check_reqs module
+* [CB-8898](https://issues.apache.org/jira/browse/CB-8898) Report expected gradle location properly
+* [CB-8898](https://issues.apache.org/jira/browse/CB-8898) Fixes gradle check failure due to missing quotes
+* [CB-9080](https://issues.apache.org/jira/browse/CB-9080) -d option is not supported on Android 4.1.1 and lower, removing
+* [CB-8954](https://issues.apache.org/jira/browse/CB-8954) Adds `requirements` command support to check_reqs module
 * Update JS snapshot to version 4.1.0-dev (via coho)
-* CB-8417 updated platform specific files from cordova.js repo
+* [CB-8417](https://issues.apache.org/jira/browse/CB-8417) updated platform specific files from cordova.js repo
 * Adding tests to confirm that preferences aren't changed by Intents
 * Forgot to remove the method that copied over the intent data
 * Getting around to removing this old Intent code
 * Update JS snapshot to version 4.1.0-dev (via coho)
 * Fix CordovaPluginTest on KitKat (start-up events seem to change)
-* CB-3360 Allow setting a custom User-Agent (close #162)
-* CB-8902 Use immersive mode when available when going fullscreen (close #175)
+* [CB-3360](https://issues.apache.org/jira/browse/CB-3360) Allow setting a custom User-Agent (close #162)
+* [CB-8902](https://issues.apache.org/jira/browse/CB-8902) Use immersive mode when available when going fullscreen (close #175)
 * Make BridgeMode methods public (they were always supposed to be)
 * Simplify: EncodingUtils.getBytes(str) -> str.getBytes()
 * Don't show warning when gradlew file is read-only
 * Don't show warning when prepEnv copies gradlew and it's read-only
 * Make gradle wrapper prepEnv code work even when android-sdk is read-only
-* CB-8897 Delete drawable/icon.png since it duplicates drawable-mdpi/icon.png
+* [CB-8897](https://issues.apache.org/jira/browse/CB-8897) Delete drawable/icon.png since it duplicates drawable-mdpi/icon.png
 * Updating the template to target mininumSdkTarget=14
-* CB-8894: Updating the template to target mininumSdkTarget=14
-* CB-8891 Add a note about when the gradle helpers were added
-* CB-8891 Add a gradle helper for retrieving config.xml preference values
-* CB-8884 Delete Eclipse tweaks from create script
-* CB-8834 Don't fail to install on VERSION_DOWNGRADE
+* [CB-8894](https://issues.apache.org/jira/browse/CB-8894) Updating the template to target mininumSdkTarget=14
+* [CB-8891](https://issues.apache.org/jira/browse/CB-8891) Add a note about when the gradle helpers were added
+* [CB-8891](https://issues.apache.org/jira/browse/CB-8891) Add a gradle helper for retrieving config.xml preference values
+* [CB-8884](https://issues.apache.org/jira/browse/CB-8884) Delete Eclipse tweaks from create script
+* [CB-8834](https://issues.apache.org/jira/browse/CB-8834) Don't fail to install on VERSION_DOWNGRADE
 * Automated tools fail, and you have to remember all four places where this is set.
 * Update the package.json
-* CB-9042 coho failed to update version, so here we are
+* [CB-9042](https://issues.apache.org/jira/browse/CB-9042) coho failed to update version, so here we are
 * CB9042 - Updating Release Notes
 * Adding tests to confirm that preferences aren't changed by Intents
 * updating existing test code
 * Forgot to remove the method that copied over the intent data
 * Getting around to removing this old Intent code
-* CB-8834 Don't fail to install on VERSION_DOWNGRADE
+* [CB-8834](https://issues.apache.org/jira/browse/CB-8834) Don't fail to install on VERSION_DOWNGRADE

 ### Release 4.0.2 (May 2015) ###

 * Removed Intent Functionality from Preferences - Preferences can no longer be set by intents

-### Release 4.0.1 (April 2015) ### 
+### Release 4.0.1 (April 2015) ###

 * Bug fixed where platform failed to install on a version downgrade

@@ -115,111 +220,111 @@ Changes For Plugin Developers:
  * Plugins can depend on Maven libraries using `<framework>` tags
 * New APIs: `onStart`, `onStop`, `onConfigurationChanged`
 * `"onScrollChanged"` message removed. Use `view.getViewTreeObserver().addOnScrollChangedListener(...)` instead
-* CB-8702 New API for plugins to override `shouldInterceptRequest` with a stream
+* [CB-8702](https://issues.apache.org/jira/browse/CB-8702) New API for plugins to override `shouldInterceptRequest` with a stream

 #### Other Changes ####
-* CB-8378 Removed `hidekeyboard` and `showkeyboard` events (apps should use a plugin instead)
-* CB-8735 `bin/create` regex relaxed / better support for numbers
-* CB-8699 Fix CordovaResourceApi `copyResource` creating zero-length files when src=uncompressed asset
-* CB-8693 CordovaLib should not contain icons / splashscreens
-* CB-8592 Fix NPE if lifecycle events reach CordovaWebView before `init()` has been called
-* CB-8588 Add CATEGORY_BROWSABLE to intents from showWebPage openExternal=true
-* CB-8587 Don't allow WebView navigations within showWebPage that are not whitelisted
-* CB-7827 Add `--activity-name` for `bin/create`
-* CB-8548 Use debug-signing.properties and release-signing.properties when they exist
-* CB-8545 Don't add a layout as a parent of the WebView
-* CB-7159 BackgroundColor not used when `<html style="opacity:0">`, nor during screen rotation
-* CB-6630 Removed OkHttp from core library. It's now available as a plugin: [cordova-plugin-okhttp](https://www.npmjs.com/package/cordova-plugin-okhttp)
+* [CB-8378](https://issues.apache.org/jira/browse/CB-8378) Removed `hidekeyboard` and `showkeyboard` events (apps should use a plugin instead)
+* [CB-8735](https://issues.apache.org/jira/browse/CB-8735) `bin/create` regex relaxed / better support for numbers
+* [CB-8699](https://issues.apache.org/jira/browse/CB-8699) Fix CordovaResourceApi `copyResource` creating zero-length files when src=uncompressed asset
+* [CB-8693](https://issues.apache.org/jira/browse/CB-8693) CordovaLib should not contain icons / splashscreens
+* [CB-8592](https://issues.apache.org/jira/browse/CB-8592) Fix NPE if lifecycle events reach CordovaWebView before `init()` has been called
+* [CB-8588](https://issues.apache.org/jira/browse/CB-8588) Add CATEGORY_BROWSABLE to intents from showWebPage openExternal=true
+* [CB-8587](https://issues.apache.org/jira/browse/CB-8587) Don't allow WebView navigations within showWebPage that are not whitelisted
+* [CB-7827](https://issues.apache.org/jira/browse/CB-7827) Add `--activity-name` for `bin/create`
+* [CB-8548](https://issues.apache.org/jira/browse/CB-8548) Use debug-signing.properties and release-signing.properties when they exist
+* [CB-8545](https://issues.apache.org/jira/browse/CB-8545) Don't add a layout as a parent of the WebView
+* [CB-7159](https://issues.apache.org/jira/browse/CB-7159) BackgroundColor not used when `<html style="opacity:0">`, nor during screen rotation
+* [CB-6630](https://issues.apache.org/jira/browse/CB-6630) Removed OkHttp from core library. It's now available as a plugin: [cordova-plugin-okhttp](https://www.npmjs.com/package/cordova-plugin-okhttp)

 ### Release 3.7.1 (January 2015) ###
-* CB-8411 Initialize plugins only after `createViews()` is called (regression in 3.7.0)
+* [CB-8411](https://issues.apache.org/jira/browse/CB-8411) Initialize plugins only after `createViews()` is called (regression in 3.7.0)

 ### Release 3.7.0 (January 2015) ###

-* CB-8328 Allow plugins to handle certificate challenges (close #150)
-* CB-8201 Add support for auth dialogs into Cordova Android
-* CB-8017 Add support for `<input type=file>` for Lollipop
-* CB-8143 Loads of gradle improvements (try it with cordova/build --gradle)
-* CB-8329 Cancel outstanding ActivityResult requests when a new startActivityForResult occurs
-* CB-8026 Bumping up Android Version and setting it up to allow third-party cookies.  This might change later.
-* CB-8210 Use PluginResult for various events from native so that content-security-policy <meta> can be used
-* CB-8168 Add support for `cordova/run --list` (closes #139)
-* CB-8176 Vastly better auto-detection of SDK & JDK locations
-* CB-8079 Use activity class package name, but fallback to application package name when looking for splash screen drawable
-* CB-8147 Have corodva/build warn about unrecognized flags rather than fail
-* CB-7881 Android tooling shouldn't lock application directory
-* CB-8112 Turn off mediaPlaybackRequiresUserGesture
-* CB-6153 Add a preference for controlling hardware button audio stream (DefaultVolumeStream)
-* CB-8031 Fix race condition that shows as ConcurrentModificationException
-* CB-7974 Cancel timeout timer if view is destroyed
-* CB-7940 Disable exec bridge if bridgeSecret is wrong
-* CB-7758 Allow content-url-hosted pages to access the bridge
-* CB-6511 Fixes build for android when app name contains unicode characters.
-* CB-7707 Added multipart PluginResult
-* CB-6837 Fix leaked window when hitting back button while alert being rendered
-* CB-7674 Move preference activation back into onCreate()
-* CB-7499 Support RTL text direction
-* CB-7330 Don't run check_reqs for bin/create.
+* [CB-8328](https://issues.apache.org/jira/browse/CB-8328) Allow plugins to handle certificate challenges (close #150)
+* [CB-8201](https://issues.apache.org/jira/browse/CB-8201) Add support for auth dialogs into Cordova Android
+* [CB-8017](https://issues.apache.org/jira/browse/CB-8017) Add support for `<input type=file>` for Lollipop
+* [CB-8143](https://issues.apache.org/jira/browse/CB-8143) Loads of gradle improvements (try it with cordova/build --gradle)
+* [CB-8329](https://issues.apache.org/jira/browse/CB-8329) Cancel outstanding ActivityResult requests when a new startActivityForResult occurs
+* [CB-8026](https://issues.apache.org/jira/browse/CB-8026) Bumping up Android Version and setting it up to allow third-party cookies.  This might change later.
+* [CB-8210](https://issues.apache.org/jira/browse/CB-8210) Use PluginResult for various events from native so that content-security-policy <meta> can be used
+* [CB-8168](https://issues.apache.org/jira/browse/CB-8168) Add support for `cordova/run --list` (closes #139)
+* [CB-8176](https://issues.apache.org/jira/browse/CB-8176) Vastly better auto-detection of SDK & JDK locations
+* [CB-8079](https://issues.apache.org/jira/browse/CB-8079) Use activity class package name, but fallback to application package name when looking for splash screen drawable
+* [CB-8147](https://issues.apache.org/jira/browse/CB-8147) Have corodva/build warn about unrecognized flags rather than fail
+* [CB-7881](https://issues.apache.org/jira/browse/CB-7881) Android tooling shouldn't lock application directory
+* [CB-8112](https://issues.apache.org/jira/browse/CB-8112) Turn off mediaPlaybackRequiresUserGesture
+* [CB-6153](https://issues.apache.org/jira/browse/CB-6153) Add a preference for controlling hardware button audio stream (DefaultVolumeStream)
+* [CB-8031](https://issues.apache.org/jira/browse/CB-8031) Fix race condition that shows as ConcurrentModificationException
+* [CB-7974](https://issues.apache.org/jira/browse/CB-7974) Cancel timeout timer if view is destroyed
+* [CB-7940](https://issues.apache.org/jira/browse/CB-7940) Disable exec bridge if bridgeSecret is wrong
+* [CB-7758](https://issues.apache.org/jira/browse/CB-7758) Allow content-url-hosted pages to access the bridge
+* [CB-6511](https://issues.apache.org/jira/browse/CB-6511) Fixes build for android when app name contains unicode characters.
+* [CB-7707](https://issues.apache.org/jira/browse/CB-7707) Added multipart PluginResult
+* [CB-6837](https://issues.apache.org/jira/browse/CB-6837) Fix leaked window when hitting back button while alert being rendered
+* [CB-7674](https://issues.apache.org/jira/browse/CB-7674) Move preference activation back into onCreate()
+* [CB-7499](https://issues.apache.org/jira/browse/CB-7499) Support RTL text direction
+* [CB-7330](https://issues.apache.org/jira/browse/CB-7330) Don't run check_reqs for bin/create.

 ### 3.6.4 (Sept 30, 2014) ###

 * Set VERSION to 3.6.4 (via coho)
 * Update JS snapshot to version 3.6.4 (via coho)
-* CB-7634 Detect JAVA_HOME properly on Ubuntu
-* CB-7579 Fix run script's ability to use non-arch-specific APKs
-* CB-6511 Fixes build for android when app name contains unicode characters.
-* CB-7463: Adding licences.  I don't know what the gradle syntax is for comments, that still needs to be done.
-* CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments
-* CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application
+* [CB-7634](https://issues.apache.org/jira/browse/CB-7634) Detect JAVA_HOME properly on Ubuntu
+* [CB-7579](https://issues.apache.org/jira/browse/CB-7579) Fix run script's ability to use non-arch-specific APKs
+* [CB-6511](https://issues.apache.org/jira/browse/CB-6511) Fixes build for android when app name contains unicode characters.
+* [CB-7463](https://issues.apache.org/jira/browse/CB-7463) Adding licences.  I don't know what the gradle syntax is for comments, that still needs to be done.
+* [CB-7463](https://issues.apache.org/jira/browse/CB-7463) Looked at the Apache BigTop git, gradle uses C-style comments
+* [CB-7460](https://issues.apache.org/jira/browse/CB-7460) Fixing bug with KitKat where the background colour would override the CSS colours on the application

 ### 3.6.0 (Sept 2014) ###

 * Set VERSION to 3.6.0 (via coho)
-* CB-7410 fix the menu test
-* CB-7410 Fix the errorUrl test
-* CB-7410 Fix Basic Authentication test
-* CB-3445: Allow build and run scripts to select APK by architecture
-* CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
-* CB-3445: Ensure that JAR files in libs directory are included
-* CB-7267 update RELEASENOTES for 3.5.1
-* CB-7410 clarify the title
-* CB-7385 update cordova.js for testing prior to branch/tag
-* CB-7410 add whitelist entries to get iframe/GoogleMaps working
-* CB-7291 propogate change in method signature to the native tests
-* CB-7291: Restrict meaning of "\*" in internal whitelist to just http and https
-* CB-7291: Only add file, content and data URLs to internal whitelist
-* CB-7291: Add defaults to external whitelist
-* CB-7291: Add external-launch-whitelist and use it for filtering intent launches
-* CB-3445: Read project.properties to configure gradle libraries
-* CB-7325 Fix error message in android_sdk_version.js when missing SDK on windows
-* CB-7335 Add a .gitignore to android project template
-* CB-7330 Fix dangling function call in last commit (broke gradle builds)
-* CB-7330 Don't run "android update" during creation
-* CB-3445 Add gradle support clean command (plus some code cleanup)
-* CB-7044 Fix typo in prev commit causing check_reqs to always fail.
-* CB-3445 Copy gradle wrapper in build instead of create
-* CB-3445 Add .gradle template files for "update" as well as "create"
-* CB-7044 Add JAVA_HOME when not set. Be stricter about ANDROID_HOME
-* CB-3445 Speed up gradle building (incremental builds go from 10s -> 1.5s for me)
-* CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
-* CB-3445: Add which to checked-in node_modules
-* CB-3445: Add option to build and install with gradle
-* CB-3445: Add an initial set of Gradle build scripts
-* CB-7321 Don't require ant for create script
-* CB-7044, CB-7299 Fix up PATH problems when possible.
+* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) fix the menu test
+* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) Fix the errorUrl test
+* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) Fix Basic Authentication test
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Allow build and run scripts to select APK by architecture
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Ensure that JAR files in libs directory are included
+* [CB-7267](https://issues.apache.org/jira/browse/CB-7267) update RELEASENOTES for 3.5.1
+* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) clarify the title
+* [CB-7385](https://issues.apache.org/jira/browse/CB-7385) update cordova.js for testing prior to branch/tag
+* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) add whitelist entries to get iframe/GoogleMaps working
+* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) propogate change in method signature to the native tests
+* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) Restrict meaning of "\*" in internal whitelist to just http and https
+* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) Only add file, content and data URLs to internal whitelist
+* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) Add defaults to external whitelist
+* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) Add external-launch-whitelist and use it for filtering intent launches
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Read project.properties to configure gradle libraries
+* [CB-7325](https://issues.apache.org/jira/browse/CB-7325) Fix error message in android_sdk_version.js when missing SDK on windows
+* [CB-7335](https://issues.apache.org/jira/browse/CB-7335) Add a .gitignore to android project template
+* [CB-7330](https://issues.apache.org/jira/browse/CB-7330) Fix dangling function call in last commit (broke gradle builds)
+* [CB-7330](https://issues.apache.org/jira/browse/CB-7330) Don't run "android update" during creation
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add gradle support clean command (plus some code cleanup)
+* [CB-7044](https://issues.apache.org/jira/browse/CB-7044) Fix typo in prev commit causing check_reqs to always fail.
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Copy gradle wrapper in build instead of create
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add .gradle template files for "update" as well as "create"
+* [CB-7044](https://issues.apache.org/jira/browse/CB-7044) Add JAVA_HOME when not set. Be stricter about ANDROID_HOME
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Speed up gradle building (incremental builds go from 10s -> 1.5s for me)
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add which to checked-in node_modules
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add option to build and install with gradle
+* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add an initial set of Gradle build scripts
+* [CB-7321](https://issues.apache.org/jira/browse/CB-7321) Don't require ant for create script
+* CB-7044, [CB-7299](https://issues.apache.org/jira/browse/CB-7299) Fix up PATH problems when possible.
 * Change in test's AndroidManifest.xml needed for the test to run properly. Forgot the manifest.
 * Change in test's AndroidManifest.xml needed for the test to run properly
 * Adding tests related to 3.5.1
-* CB-7261 Fix setNativeToJsBridgeMode sometimes crashing when switching to ONLINE_EVENT
-* CB-7265 Fix crash when navigating to custom protocol (introduced in 3.5.1)
+* [CB-7261](https://issues.apache.org/jira/browse/CB-7261) Fix setNativeToJsBridgeMode sometimes crashing when switching to ONLINE_EVENT
+* [CB-7265](https://issues.apache.org/jira/browse/CB-7265) Fix crash when navigating to custom protocol (introduced in 3.5.1)
 * Filter out non-launchable intents
 * Handle unsupported protocol errors in webview better
-* CB-7238: I should have collapsed this, but Config.init() must go before the creation of CordovaWebView
-* CB-7238: Minor band-aid to get tests running again, this has to go away before 3.6.0 is released, since this is an API change.
+* [CB-7238](https://issues.apache.org/jira/browse/CB-7238) I should have collapsed this, but Config.init() must go before the creation of CordovaWebView
+* [CB-7238](https://issues.apache.org/jira/browse/CB-7238) Minor band-aid to get tests running again, this has to go away before 3.6.0 is released, since this is an API change.
 * Extend whitelist to handle URLs without // chars
-* CB-7172 Force window to have focus after resume
-* CB-7159 Set background color of webView as well as its parent
-* CB-7018 Fix setButtonPlumbedToJs never un-listening
+* [CB-7172](https://issues.apache.org/jira/browse/CB-7172) Force window to have focus after resume
+* [CB-7159](https://issues.apache.org/jira/browse/CB-7159) Set background color of webView as well as its parent
+* [CB-7018](https://issues.apache.org/jira/browse/CB-7018) Fix setButtonPlumbedToJs never un-listening
 * Undeprecate some just-deprecated symbols in PluginManager.
 * @Deprecate methods of PluginManager that were never meant to be public
 * Move plugin instantiation and instance storing logic PluginEntry->PluginManager
@@ -244,7 +349,7 @@ Changes For Plugin Developers:
 * Fix PluginManager.setPluginEntries not removing old entries
 * Move registration of App plugin from config.xml -> code
 * Make setWebViewClient an override instead of an overload. Delete Location-change JS->Native bridge mode (missed some of it).
-* CB-4404 Revert setting android:windowSoftInputMode to "adjustPan"
+* [CB-4404](https://issues.apache.org/jira/browse/CB-4404) Revert setting android:windowSoftInputMode to "adjustPan"
 * Refactor: Use ConfigXmlParser in activity. Adds CordovaWebView.init()
 * Deprecate some convenience methods on CordovaActivity
 * Fix CordovaPreferences not correctly parsing hex values (valueOf->decode)
@@ -256,36 +361,36 @@ Changes For Plugin Developers:
 * Delete "CB-3064: The errorUrl is..." Log message left over from debugging presumably
 * Refactor Config into ConfigXmlParser, CordovaPreferences
 * Delete Location-change JS->Native bridge mode
-* CB-5988 Allow exec() only from file: or start-up URL's domain
-* CB-6761 Fix native->JS bridge ceasing to fire when page changes and online is set to false and the JS loads quickly
+* [CB-5988](https://issues.apache.org/jira/browse/CB-5988) Allow exec() only from file: or start-up URL's domain
+* [CB-6761](https://issues.apache.org/jira/browse/CB-6761) Fix native->JS bridge ceasing to fire when page changes and online is set to false and the JS loads quickly
 * Update the errorurl to no longer use intents
 * This breaks running the JUnit tests, we'll bring it back soon
 * Refactoring the URI handling on Cordova, removing dead code
-* CB-7018 Clean up and deprecation of some button-related functions
-* CB-7017 Fix onload=true being set on all subsequent plugins
-* CB-5971: Fix package / project validation
-* CB-5971: Add unit tests to cordova-android
-* CB-5971: Factor out package/project name validation logic
+* [CB-7018](https://issues.apache.org/jira/browse/CB-7018) Clean up and deprecation of some button-related functions
+* [CB-7017](https://issues.apache.org/jira/browse/CB-7017) Fix onload=true being set on all subsequent plugins
+* [CB-5971](https://issues.apache.org/jira/browse/CB-5971) Fix package / project validation
+* [CB-5971](https://issues.apache.org/jira/browse/CB-5971) Add unit tests to cordova-android
+* [CB-5971](https://issues.apache.org/jira/browse/CB-5971) Factor out package/project name validation logic
 * Delete explicit activity.finish() in back button handling. No change in behaviour.
-* CB-5971: This would have been a good first bug, too bad
-* CB-4404: Changing where android:windowSoftInputMode is in the manifest so it works
+* [CB-5971](https://issues.apache.org/jira/browse/CB-5971) This would have been a good first bug, too bad
+* [CB-4404](https://issues.apache.org/jira/browse/CB-4404) Changing where android:windowSoftInputMode is in the manifest so it works
 * Add documentation referencing other implementation.
-* CB-6851 Deprecate WebView.sendJavascript()
-* CB-6876 Show the correct executable name
-* CB-6876 Fix the "print usage"
+* [CB-6851](https://issues.apache.org/jira/browse/CB-6851) Deprecate WebView.sendJavascript()
+* [CB-6876](https://issues.apache.org/jira/browse/CB-6876) Show the correct executable name
+* [CB-6876](https://issues.apache.org/jira/browse/CB-6876) Fix the "print usage"
 * Trivial spelling fix in comments when reading CordovaResourceApi
-* CB-6818: I want to remove this code, because Square didn't do their headers properly
-* CB-6860 Add activity_name and launcher_name to AndroidManifest.xml & strings.xml
+* [CB-6818](https://issues.apache.org/jira/browse/CB-6818) I want to remove this code, because Square didn't do their headers properly
+* [CB-6860](https://issues.apache.org/jira/browse/CB-6860) Add activity_name and launcher_name to AndroidManifest.xml & strings.xml
 * Add a comment to custom_rules.xml saying why we move AndroidManifest.xml
 * Remove +x from README.md
-* CB-6784 Add missing licenses
-* CB-6784 Add license to CONTRIBUTING.md
+* [CB-6784](https://issues.apache.org/jira/browse/CB-6784) Add missing licenses
+* [CB-6784](https://issues.apache.org/jira/browse/CB-6784) Add license to CONTRIBUTING.md
 * Revert "defaults.xml: Add AndroidLaunchMode preference"
 * updated RELEASENOTES
-* CB-6315: Wrapping this so it runs on the UI thread
-* CB-6723 Update package name for Robotium
-* CB-6707 Update minSdkVersion to 10 consistently
-* CB-5652 make visible cordova version
+* [CB-6315](https://issues.apache.org/jira/browse/CB-6315) Wrapping this so it runs on the UI thread
+* [CB-6723](https://issues.apache.org/jira/browse/CB-6723) Update package name for Robotium
+* [CB-6707](https://issues.apache.org/jira/browse/CB-6707) Update minSdkVersion to 10 consistently
+* [CB-5652](https://issues.apache.org/jira/browse/CB-5652) make visible cordova version
 * Update JS snapshot to version 3.6.0-dev (via coho)
 * Update JS snapshot to version 3.6.0-dev (via coho)
 * Set VERSION to 3.6.0-dev (via coho)
@@ -305,112 +410,112 @@ http://cordova.apache.org/announcements/2014/08/04/android-351.html

 * OkHttp has broken headers. Updating for ASF compliance.
 * Revert accidentally removed lines from NOTICE
-* CB-6552: added top level package.json
-* CB-6491 add CONTRIBUTING.md
-* CB-6543 Fix cordova/run failure when no custom_rules.xml available
+* [CB-6552](https://issues.apache.org/jira/browse/CB-6552) added top level package.json
+* [CB-6491](https://issues.apache.org/jira/browse/CB-6491) add CONTRIBUTING.md
+* [CB-6543](https://issues.apache.org/jira/browse/CB-6543) Fix cordova/run failure when no custom_rules.xml available
 * defaults.xml: Add AndroidLaunchMode preference
 * Add JavaDoc for CordovaResourceApi
-* CB-6388: Handle binary data correctly in LOAD_URL bridge
-* Fix CB-6048: Set launchMode=singleTop so tapping app icon does not always restart app
+* [CB-6388](https://issues.apache.org/jira/browse/CB-6388) Handle binary data correctly in LOAD_URL bridge
+* Fix [CB-6048](https://issues.apache.org/jira/browse/CB-6048) Set launchMode=singleTop so tapping app icon does not always restart app
 * Remove incorrect usage of AlertDialog.Builder.create
 * Catch uncaught exceptions in from plugins and turn them into error responses.
 * Add NOTICE file
-* CB-6047 Fix online sometimes getting in a bad state on page transitions.
+* [CB-6047](https://issues.apache.org/jira/browse/CB-6047) Fix online sometimes getting in a bad state on page transitions.
 * Add another convenience overload for CordovaResourceApi.copyResource
 * Update framework's .classpath to what Eclipse wants it to be.
 * README.md: `android update` to `android-19`.
 * Fix NPE when POLLING bridge mode is used.
 * Updating NOTICE to include Square for OkHttp
-* CB-5398 Apply KitKat content URI fix to all content URIs
-* CB-5398 Work-around for KitKat content: URLs not rendering in <img> tags
-* CB-5908: add splascreen images to template
-* CB-5395: Make scheme and host (but not path) case-insensitive in whitelist
+* [CB-5398](https://issues.apache.org/jira/browse/CB-5398) Apply KitKat content URI fix to all content URIs
+* [CB-5398](https://issues.apache.org/jira/browse/CB-5398) Work-around for KitKat content: URLs not rendering in <img> tags
+* [CB-5908](https://issues.apache.org/jira/browse/CB-5908) add splascreen images to template
+* [CB-5395](https://issues.apache.org/jira/browse/CB-5395) Make scheme and host (but not path) case-insensitive in whitelist
 * Ignore multiple onPageFinished() callbacks & onReceivedError due to stopLoading()
 * Removing addJavascriptInterface support from all Android versions lower than 4.2 due to security vu
-* CB-4984 Don't create on CordovaActivity name
-* CB-5917 Add a loadUrlIntoView overload that doesn't recreate plugins.
+* [CB-4984](https://issues.apache.org/jira/browse/CB-4984) Don't create on CordovaActivity name
+* [CB-5917](https://issues.apache.org/jira/browse/CB-5917) Add a loadUrlIntoView overload that doesn't recreate plugins.
 * Use thread pool for load timeout.
-* CB-5715 For CLI, hide assets/www and res/xml/config.xml by default
-* CB-5793 ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/
-* CB-5889 Make update script find project name instead of using "null" for CordovaLib
-* CB-5889 Add a message in the update script about needing to import CordovaLib when using an IDE.
+* [CB-5715](https://issues.apache.org/jira/browse/CB-5715) For CLI, hide assets/www and res/xml/config.xml by default
+* [CB-5793](https://issues.apache.org/jira/browse/CB-5793) ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/
+* [CB-5889](https://issues.apache.org/jira/browse/CB-5889) Make update script find project name instead of using "null" for CordovaLib
+* [CB-5889](https://issues.apache.org/jira/browse/CB-5889) Add a message in the update script about needing to import CordovaLib when using an IDE.

 ### 3.4.0 (Feb 2014) ###

 43 commits from 10 authors. Highlights include:

 * Removing addJavascriptInterface support from all Android versions lower than 4.2 due to security vulnerability
-* CB-5917 Add a loadUrlIntoView overload that doesn't recreate plugins.
-* CB-5889 Make update script find project name instead of using "null" for CordovaLib
-* CB-5889 Add a message in the update script about needing to import CordovaLib when using an IDE.
-* CB-5793 Don't clean before build and change output directory to ant-build to avoid conflicts with Eclipse.
-* CB-5803 Fix cordova/emulate on windows.
-* CB-5801 exec->spawn in build to make sure compile errors are shown.
-* CB-5799 Update version of OkHTTP to 1.3
-* CB-4910 Update CLI project template to point to config.xml at the root now that it's not in www/ by default.
-* CB-5504 Adding onDestroy to app plugin to deregister telephonyReceiver
-* CB-5715 Add Eclipse .project file to create template. For CLI projects, it adds refs for root www/ & config.xml and hides platform versions
-* CB-5447 Removed android:debuggable=“true” from project template.
-* CB-5714 Fix of android build when too big output stops build with error due to buffer overflow.
-* CB-5592 Set MIME type for openExternal when scheme is file:
+* [CB-5917](https://issues.apache.org/jira/browse/CB-5917) Add a loadUrlIntoView overload that doesn't recreate plugins.
+* [CB-5889](https://issues.apache.org/jira/browse/CB-5889) Make update script find project name instead of using "null" for CordovaLib
+* [CB-5889](https://issues.apache.org/jira/browse/CB-5889) Add a message in the update script about needing to import CordovaLib when using an IDE.
+* [CB-5793](https://issues.apache.org/jira/browse/CB-5793) Don't clean before build and change output directory to ant-build to avoid conflicts with Eclipse.
+* [CB-5803](https://issues.apache.org/jira/browse/CB-5803) Fix cordova/emulate on windows.
+* [CB-5801](https://issues.apache.org/jira/browse/CB-5801) exec->spawn in build to make sure compile errors are shown.
+* [CB-5799](https://issues.apache.org/jira/browse/CB-5799) Update version of OkHTTP to 1.3
+* [CB-4910](https://issues.apache.org/jira/browse/CB-4910) Update CLI project template to point to config.xml at the root now that it's not in www/ by default.
+* [CB-5504](https://issues.apache.org/jira/browse/CB-5504) Adding onDestroy to app plugin to deregister telephonyReceiver
+* [CB-5715](https://issues.apache.org/jira/browse/CB-5715) Add Eclipse .project file to create template. For CLI projects, it adds refs for root www/ & config.xml and hides platform versions
+* [CB-5447](https://issues.apache.org/jira/browse/CB-5447) Removed android:debuggable=“true” from project template.
+* [CB-5714](https://issues.apache.org/jira/browse/CB-5714) Fix of android build when too big output stops build with error due to buffer overflow.
+* [CB-5592](https://issues.apache.org/jira/browse/CB-5592) Set MIME type for openExternal when scheme is file:

 ### 3.3.0 (Dec 2013) ###

 41 commits from 11 authors. Highlights include:

-* CB-5481 Fix for Cordova trying to get config.xml from the wrong namespace
-* CB-5487 Enable Remote Debugging when your Android app is debuggable.
-* CB-5445 Adding onScrollChanged and the ScrollEvent object
-* CB-5422 Don't require JAVA_HOME to be defined
-* CB-5490 Add javadoc target to ant script
-* CB-5471 Deprecated DroidGap class
-* CB-5255 Prefer Google API targets over android-## targets when building.
-* CB-5232 Change create script to use Cordova as a Library Project instead of a .jar
-* CB-5302 Massive movement to get tests working again
-* CB-4996 Fix paths with spaces while launching on emulator and device
-* CB-5209 Cannot build Android app if project path contains spaces
+* [CB-5481](https://issues.apache.org/jira/browse/CB-5481) Fix for Cordova trying to get config.xml from the wrong namespace
+* [CB-5487](https://issues.apache.org/jira/browse/CB-5487) Enable Remote Debugging when your Android app is debuggable.
+* [CB-5445](https://issues.apache.org/jira/browse/CB-5445) Adding onScrollChanged and the ScrollEvent object
+* [CB-5422](https://issues.apache.org/jira/browse/CB-5422) Don't require JAVA_HOME to be defined
+* [CB-5490](https://issues.apache.org/jira/browse/CB-5490) Add javadoc target to ant script
+* [CB-5471](https://issues.apache.org/jira/browse/CB-5471) Deprecated DroidGap class
+* [CB-5255](https://issues.apache.org/jira/browse/CB-5255) Prefer Google API targets over android-## targets when building.
+* [CB-5232](https://issues.apache.org/jira/browse/CB-5232) Change create script to use Cordova as a Library Project instead of a .jar
+* [CB-5302](https://issues.apache.org/jira/browse/CB-5302) Massive movement to get tests working again
+* [CB-4996](https://issues.apache.org/jira/browse/CB-4996) Fix paths with spaces while launching on emulator and device
+* [CB-5209](https://issues.apache.org/jira/browse/CB-5209) Cannot build Android app if project path contains spaces


 ### 3.2.0 (Nov 2013) ###

 27 commits from 7 authors. Highlights include:

-* CB-5193 Fix Android WebSQL sometime throwing SECURITY_ERR.
-* CB-5191 Deprecate <url-filter>
+* [CB-5193](https://issues.apache.org/jira/browse/CB-5193) Fix Android WebSQL sometime throwing SECURITY_ERR.
+* [CB-5191](https://issues.apache.org/jira/browse/CB-5191) Deprecate <url-filter>
 * Updating shelljs to 0.2.6. Copy now preserves mode bits.
-* CB-4872 Added android version scripts (android_sdk_version, etc)
-* CB-5117 Output confirmation message if check_reqs passes.
-* CB-5080 Find resources in a way that works with aapt's --rename-manifest-package
-* CB-4527 Don't delete .bat files even when on non-windows platform
-* CB-4892 Fix create script only escaping the first space instead of all spaces.
+* [CB-4872](https://issues.apache.org/jira/browse/CB-4872) Added android version scripts (android_sdk_version, etc)
+* [CB-5117](https://issues.apache.org/jira/browse/CB-5117) Output confirmation message if check_reqs passes.
+* [CB-5080](https://issues.apache.org/jira/browse/CB-5080) Find resources in a way that works with aapt's --rename-manifest-package
+* [CB-4527](https://issues.apache.org/jira/browse/CB-4527) Don't delete .bat files even when on non-windows platform
+* [CB-4892](https://issues.apache.org/jira/browse/CB-4892) Fix create script only escaping the first space instead of all spaces.

 ### 3.1.0 (Sept 2013) ###

 55 commits from 9 authors. Highlights include:

-* [CB-4817] Remove unused assets in project template.
+* [CB-4817](https://issues.apache.org/jira/browse/CB-4817) Remove unused assets in project template.
 * Fail fast in create script if package name is not com.foo.bar.
-* [CB-4782] Convert ApplicationInfo.java -> appinfo.js
-* [CB-4766] Deprecated JSONUtils.java (moved into plugins)
-* [CB-4765] Deprecated ExifHelper.java (moved into plugins)
-* [CB-4764] Deprecated DirectoryManager.java (moved into plugins)
-* [CB-4763] Deprecated FileHelper.java (moved into plugins), Move getMimeType() into CordovaResourceApi.
-* [CB-4725] Add CordovaWebView.CORDOVA_VERSION constant
+* [CB-4782](https://issues.apache.org/jira/browse/CB-4782) Convert ApplicationInfo.java -> appinfo.js
+* [CB-4766](https://issues.apache.org/jira/browse/CB-4766) Deprecated JSONUtils.java (moved into plugins)
+* [CB-4765](https://issues.apache.org/jira/browse/CB-4765) Deprecated ExifHelper.java (moved into plugins)
+* [CB-4764](https://issues.apache.org/jira/browse/CB-4764) Deprecated DirectoryManager.java (moved into plugins)
+* [CB-4763](https://issues.apache.org/jira/browse/CB-4763) Deprecated FileHelper.java (moved into plugins), Move getMimeType() into CordovaResourceApi.
+* [CB-4725](https://issues.apache.org/jira/browse/CB-4725) Add CordovaWebView.CORDOVA_VERSION constant
 * Incrementing version check for Android 4.3 API Level 18
-* [CB-3542] rewrote cli tooling scripts in node
+* [CB-3542](https://issues.apache.org/jira/browse/CB-3542) rewrote cli tooling scripts in node
 * Allow CordovaChromeClient subclasses access to CordovaInterface and CordovaWebView members
 * Refactor CordovaActivity.init so that subclasses can easily override factory methods for webview objects
-* [CB-4652] Allow default project template to be overridden on create
+* [CB-4652](https://issues.apache.org/jira/browse/CB-4652) Allow default project template to be overridden on create
 * Tweak the online bridge to not send excess online events.
-* [CB-4495] Modify start-emulator script to exit immediately on a fatal emulator error.
+* [CB-4495](https://issues.apache.org/jira/browse/CB-4495) Modify start-emulator script to exit immediately on a fatal emulator error.
 * Log WebView IOExceptions only when they are not 404s
 * Use a higher threshold for slow exec() warnings when debugger is attached.
 * Fix data URI decoding in CordovaResourceApi
-* [CB-3819] Made it easier to set SplashScreen delay.
-* [CB-4013] Fixed loadUrlTimeoutValue preference.
+* [CB-3819](https://issues.apache.org/jira/browse/CB-3819) Made it easier to set SplashScreen delay.
+* [CB-4013](https://issues.apache.org/jira/browse/CB-4013) Fixed loadUrlTimeoutValue preference.
 * Upgrading project to Android 4.3
-* [CB-4198] bin/create script should be better at handling non-word characters in activity name. Patched windows script as well.
-* [CB-4198] bin/create should handle spaces in activity better.
-* [CB-4096] Implemented new unified whitelist for android
-* [CB-3384] Fix thread assertion when plugins remap URIs
+* [CB-4198](https://issues.apache.org/jira/browse/CB-4198) bin/create script should be better at handling non-word characters in activity name. Patched windows script as well.
+* [CB-4198](https://issues.apache.org/jira/browse/CB-4198) bin/create should handle spaces in activity better.
+* [CB-4096](https://issues.apache.org/jira/browse/CB-4096) Implemented new unified whitelist for android
+* [CB-3384](https://issues.apache.org/jira/browse/CB-3384) Fix thread assertion when plugins remap URIs

--- a/2
+++ b/2
@@ -1 +1 @@
-4.1.0-dev
+5.2.2
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -0,0 +1,19 @@
+environment:
+  matrix:
+  - nodejs_version: "0.10"
+  - nodejs_version: "0.12"
+  - nodejs_version: "4.2"
+
+install:
+#   - cinst android-sdk
+#   - echo y | android update sdk -u --filter android-22,android-23
+  - ps: Install-Product node $env:nodejs_version
+  - npm install
+
+build: off
+
+test_script:
+  - node --version
+  - npm --version
+  - npm run test
+#   - npm run test-build
--- a/bin/create
+++ b/bin/create
@@ -19,14 +19,16 @@
       under the License.
 */
 var path = require('path');
-var create = require('./lib/create');
+var ConfigParser = require('cordova-common').ConfigParser;
+var Api = require('./templates/cordova/Api');
+
 var argv = require('nopt')({
    'help' : Boolean,
    'cli' : Boolean,
    'shared' : Boolean,
    'link' : Boolean,
    'activity-name' : [String, undefined]
-});
+}, { 'd' : '--verbose' });

 if (argv.help || argv.argv.remain.length === 0) {
    console.log('Usage: ' + path.relative(process.cwd(), path.join(__dirname, 'create')) + ' <path_to_new_project> <package_name> <project_name> [<template_path>] [--activity-name <activity_name>] [--link]');
@@ -39,11 +41,18 @@ if (argv.help || argv.argv.remain.length === 0) {
    process.exit(1);
 }

-var project_path = argv.argv.remain[0];
-var package_name = argv.argv.remain[1];
-var project_name = argv.argv.remain[2];
-var template_path = argv.argv.remain[3];
-var activity_name = argv['activity-name'];
+var config = new ConfigParser(path.resolve(__dirname, 'templates/project/res/xml/config.xml'));

-create.createProject(project_path, package_name, project_name, activity_name, template_path, argv.link || argv.shared, argv.cli).done();
+if (argv.argv.remain[1]) config.setPackageName(argv.argv.remain[1]);
+if (argv.argv.remain[2]) config.setName(argv.argv.remain[2]);
+if (argv['activity-name']) config.setName(argv['activity-name']);

+var options = {
+    link: argv.link || argv.shared,
+    customTemplate: argv.argv.remain[3],
+    activityName: argv['activity-name']
+};
+
+require('./templates/cordova/loggingHelper').adjustLoggerLevel(argv);
+
+Api.createPlatform(argv.argv.remain[0], config, options).done();
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -26,15 +26,14 @@ var shelljs = require('shelljs'),
    Q     = require('q'),
    path  = require('path'),
    fs    = require('fs'),
-    which = require('which'),
    ROOT  = path.join(__dirname, '..', '..');
+var CordovaError = require('cordova-common').CordovaError;

 var isWindows = process.platform == 'win32';

 function forgivingWhichSync(cmd) {
    try {
-        // TODO: Should use shelljs.which() here to have one less dependency.
-        return fs.realpathSync(which.sync(cmd));
+        return fs.realpathSync(shelljs.which(cmd));
    } catch (e) {
        return '';
    }
@@ -43,7 +42,7 @@ function forgivingWhichSync(cmd) {
 function tryCommand(cmd, errMsg, catchStderr) {
    var d = Q.defer();
    child_process.exec(cmd, function(err, stdout, stderr) {
-        if (err) d.reject(new Error(errMsg));
+        if (err) d.reject(new CordovaError(errMsg));
        // Sometimes it is necessary to return an stderr instead of stdout in case of success, since
        // some commands prints theirs output to stderr instead of stdout. 'javac' is the example
        else d.resolve((catchStderr ? stderr : stdout).trim());
@@ -82,15 +81,16 @@ module.exports.check_ant = function() {
 // Returns a promise. Called only by build and clean commands.
 module.exports.check_gradle = function() {
    var sdkDir = process.env['ANDROID_HOME'];
-    var message = 'Could not find gradle wrapper within Android SDK. ';
-    if (!sdkDir) return Q.reject(message + 'Might need to install Android SDK or set up \'ADROID_HOME\' env variable.');
-    var wrapper = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper', 'gradlew');
-    return tryCommand('"' + wrapper + '" -v', message + 'Might need to update your Android SDK.\n' +
-            'Looked here: ' + path.dirname(wrapper))
-    .then(function (output) {
-        // Parse Gradle version from command output
-        return/^gradle ((?:\d+\.)+(?:\d+))/gim.exec(output)[1];
-    });
+    if (!sdkDir)
+        return Q.reject(new CordovaError('Could not find gradle wrapper within Android SDK. Could not find Android SDK directory.\n' +
+            'Might need to install Android SDK or set up \'ANDROID_HOME\' env variable.'));
+
+    var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
+    if (!fs.existsSync(wrapperDir)) {
+        return Q.reject(new CordovaError('Could not find gradle wrapper within Android SDK. Might need to update your Android SDK.\n' +
+            'Looked here: ' + wrapperDir));
+    }
+    return Q.when();
 };

 // Returns a promise.
@@ -119,7 +119,7 @@ module.exports.check_java = function() {
                    if (fs.existsSync(path.join(maybeJavaHome, 'lib', 'tools.jar'))) {
                        process.env['JAVA_HOME'] = maybeJavaHome;
                    } else {
-                        throw new Error(msg);
+                        throw new CordovaError(msg);
                    }
                }
            } else if (isWindows) {
@@ -142,21 +142,20 @@ module.exports.check_java = function() {
            }
        }
    }).then(function() {
-        var msg =
-            'Failed to run "java -version", make sure that you have a JDK installed.\n' +
-            'You can get it from: http://www.oracle.com/technetwork/java/javase/downloads.\n';
-        if (process.env['JAVA_HOME']) {
-            msg += 'Your JAVA_HOME is invalid: ' + process.env['JAVA_HOME'] + '\n';
-        }
-        return tryCommand('java -version', msg)
-        .then(function() {
+            var msg =
+                'Failed to run "javac -version", make sure that you have a JDK installed.\n' +
+                'You can get it from: http://www.oracle.com/technetwork/java/javase/downloads.\n';
+            if (process.env['JAVA_HOME']) {
+                msg += 'Your JAVA_HOME is invalid: ' + process.env['JAVA_HOME'] + '\n';
+            }
            // We use tryCommand with catchStderr = true, because
            // javac writes version info to stderr instead of stdout
-            return tryCommand('javac -version', msg, true);
-        }).then(function (output) {
-            return /^javac ((?:\d+\.)+(?:\d+))/i.exec(output)[1];
+            return tryCommand('javac -version', msg, true)
+                .then(function (output) {
+                    var match = /javac ((?:\d+\.)+(?:\d+))/i.exec(output);
+                    return match && match[1];
+                });
        });
-    });
 };

 // Returns a promise.
@@ -210,7 +209,7 @@ module.exports.check_android = function() {
                process.env['ANDROID_HOME'] = grandParentDir;
                hasAndroidHome = true;
            } else {
-                throw new Error('Failed to find \'ANDROID_HOME\' environment variable. Try setting setting it manually.\n' +
+                throw new CordovaError('Failed to find \'ANDROID_HOME\' environment variable. Try setting setting it manually.\n' +
                    'Detected \'android\' command at ' + parentDir + ' but no \'tools\' directory found near.\n' +
                    'Try reinstall Android SDK or update your PATH to include path to valid SDK directory.');
            }
@@ -219,27 +218,31 @@ module.exports.check_android = function() {
            process.env['PATH'] += path.delimiter + path.join(process.env['ANDROID_HOME'], 'platform-tools');
        }
        if (!process.env['ANDROID_HOME']) {
-            throw new Error('Failed to find \'ANDROID_HOME\' environment variable. Try setting setting it manually.\n' +
+            throw new CordovaError('Failed to find \'ANDROID_HOME\' environment variable. Try setting setting it manually.\n' +
                'Failed to find \'android\' command in your \'PATH\'. Try update your \'PATH\' to include path to valid SDK directory.');
        }
        if (!fs.existsSync(process.env['ANDROID_HOME'])) {
-            throw new Error('\'ANDROID_HOME\' environment variable is set to non-existent path: ' + process.env['ANDROID_HOME'] +
+            throw new CordovaError('\'ANDROID_HOME\' environment variable is set to non-existent path: ' + process.env['ANDROID_HOME'] +
                '\nTry update it manually to point to valid SDK directory.');
        }
    });
 };

-module.exports.getAbsoluteAndroidCmd = function() {
-    return forgivingWhichSync('android').replace(/(\s)/g, '\\$1');
+module.exports.getAbsoluteAndroidCmd = function () {
+    var cmd = forgivingWhichSync('android');
+    if (process.platform === 'win32') {
+        return '"' + cmd + '"';
+    }
+    return cmd.replace(/(\s)/g, '\\$1');
 };

-module.exports.check_android_target = function(valid_target) {
+module.exports.check_android_target = function(originalError) {
    // valid_target can look like:
    //   android-19
    //   android-L
    //   Google Inc.:Google APIs:20
    //   Google Inc.:Glass Development Kit Preview:20
-    if (!valid_target) valid_target = module.exports.get_target();
+    var valid_target = module.exports.get_target();
    var msg = 'Android SDK not found. Make sure that it is installed. If it is not at the default location, set the ANDROID_HOME environment variable.';
    return tryCommand('android list targets --compact', msg)
    .then(function(output) {
@@ -249,18 +252,22 @@ module.exports.check_android_target = function(valid_target) {
        }

        var androidCmd = module.exports.getAbsoluteAndroidCmd();
-        throw new Error('Please install Android target: "' + valid_target + '".\n\n' +
+        var msg = 'Please install Android target: "' + valid_target + '".\n\n' +
            'Hint: Open the SDK manager by running: ' + androidCmd + '\n' +
            'You will require:\n' +
            '1. "SDK Platform" for ' + valid_target + '\n' +
            '2. "Android SDK Platform-tools (latest)\n' +
-            '3. "Android SDK Build-tools" (latest)');
+            '3. "Android SDK Build-tools" (latest)';
+        if (originalError) {
+            msg = originalError + '\n' + msg;
+        }
+        throw new CordovaError(msg);
    });
 };

 // Returns a promise.
 module.exports.run = function() {
-    return Q.all([this.check_java(), this.check_android().then(this.check_android_target)])
+    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']);
@@ -315,7 +322,7 @@ module.exports.check_all = function() {
            requirement.installed = true;
            requirement.metadata.version = version;
        }, function (err) {
-            requirement.metadata.reason = err;
+            requirement.metadata.reason = err instanceof Error ? err.message : err;
        });
    }, Q())
    .then(function () {
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -26,6 +26,11 @@ var shell = require('shelljs'),
    check_reqs = require('./check_reqs'),
    ROOT    = path.join(__dirname, '..', '..');

+var MIN_SDK_VERSION = 14;
+
+var CordovaError = require('cordova-common').CordovaError;
+var AndroidManifest = require('../templates/cordova/lib/AndroidManifest');
+
 function setShellFatal(value, func) {
    var oldVal = shell.config.fatal;
    shell.config.fatal = value;
@@ -41,6 +46,16 @@ function copyJsAndLibrary(projectPath, shared, projectName) {
    var nestedCordovaLibPath = getFrameworkDir(projectPath, false);
    var srcCordovaJsPath = path.join(ROOT, 'bin', 'templates', 'project', 'assets', 'www', 'cordova.js');
    shell.cp('-f', srcCordovaJsPath, path.join(projectPath, 'assets', 'www', 'cordova.js'));
+
+    // Copy the cordova.js file to platforms/<platform>/platform_www/
+    // The www dir is nuked on each prepare so we keep cordova.js in platform_www
+    shell.mkdir('-p', path.join(projectPath, 'platform_www'));
+    shell.cp('-f', srcCordovaJsPath, path.join(projectPath, 'platform_www'));
+
+    // Copy cordova-js-src directory into platform_www directory.
+    // We need these files to build cordova.js if using browserify method.
+    shell.cp('-rf', path.join(ROOT, 'cordova-js-src'), path.join(projectPath, 'platform_www'));
+
    // Don't fail if there are no old jars.
    setShellFatal(false, function() {
        shell.ls(path.join(projectPath, 'libs', 'cordova-*.jar')).forEach(function(oldJar) {
@@ -89,6 +104,7 @@ function writeProjectProperties(projectPath, target_api) {
    var dstPath = path.join(projectPath, 'project.properties');
    var templatePath = path.join(ROOT, 'bin', 'templates', 'project', 'project.properties');
    var srcPath = fs.existsSync(dstPath) ? dstPath : templatePath;
+
    var data = fs.readFileSync(srcPath, 'utf8');
    data = data.replace(/^target=.*/m, 'target=' + target_api);
    var subProjects = extractSubProjectPaths(data);
@@ -110,8 +126,8 @@ function writeProjectProperties(projectPath, target_api) {
 }

 function prepBuildFiles(projectPath) {
-    var buildModule = require(path.join(path.resolve(projectPath), 'cordova', 'lib', 'build'));
-    buildModule.prepBuildFiles();
+    var buildModule = require(path.resolve(projectPath, 'cordova/lib/builders/builders'));
+    buildModule.getBuilder('gradle').prepBuildFiles();
 }

 function copyBuildRules(projectPath) {
@@ -127,7 +143,7 @@ function copyScripts(projectPath) {
    shell.rm('-rf', destScriptsDir);
    // Copy in the new ones.
    shell.cp('-r', srcScriptsDir, projectPath);
-    shell.cp('-r', path.join(ROOT, 'bin', 'node_modules'), destScriptsDir);
+    shell.cp('-r', path.join(ROOT, 'node_modules'), destScriptsDir);
    shell.cp(path.join(ROOT, 'bin', 'check_reqs*'), destScriptsDir);
    shell.cp(path.join(ROOT, 'bin', 'lib', 'check_reqs.js'), path.join(projectPath, 'cordova', 'lib', 'check_reqs.js'));
    shell.cp(path.join(ROOT, 'bin', 'android_sdk_version'), path.join(destScriptsDir, 'android_sdk_version'));
@@ -143,13 +159,14 @@ function validatePackageName(package_name) {
    //Make the package conform to Java package types
    //http://developer.android.com/guide/topics/manifest/manifest-element.html#package
    //Enforce underscore limitation
+    var msg = 'Error validating package name. ';
    if (!/^[a-zA-Z][a-zA-Z0-9_]+(\.[a-zA-Z][a-zA-Z0-9_]*)+$/.test(package_name)) {
-        return Q.reject('Package name must look like: com.company.Name');
+        return Q.reject(new CordovaError(msg + 'Package name must look like: com.company.Name'));
    }

    //Class is a reserved word
    if(/\b[Cc]lass\b/.test(package_name)) {
-        return Q.reject('class is a reserved word');
+        return Q.reject(new CordovaError(msg + '"class" is a reserved word'));
    }

    return Q.resolve();
@@ -161,78 +178,78 @@ function validatePackageName(package_name) {
 * otherwise.
 */
 function validateProjectName(project_name) {
+    var msg = 'Error validating project name. ';
    //Make sure there's something there
    if (project_name === '') {
-        return Q.reject('Project name cannot be empty');
+        return Q.reject(new CordovaError(msg + 'Project name cannot be empty'));
    }

    //Enforce stupid name error
    if (project_name === 'CordovaActivity') {
-        return Q.reject('Project name cannot be CordovaActivity');
+        return Q.reject(new CordovaError(msg + 'Project name cannot be CordovaActivity'));
    }

    //Classes in Java don't begin with numbers
    if (/^[0-9]/.test(project_name)) {
-        return Q.reject('Project name must not begin with a number');
+        return Q.reject(new CordovaError(msg + 'Project name must not begin with a number'));
    }

    return Q.resolve();
 }

 /**
- * $ create [options]
- *
 * Creates an android application with the given options.
 *
- * Options:
+ * @param   {String}  project_path  Path to the new Cordova android project.
+ * @param   {ConfigParser}  config  Instance of ConfigParser to retrieve basic
+ *   project properties.
+ * @param   {Object}  [options={}]  Various options
+ * @param   {String}  [options.activityName='MainActivity']  Name for the
+ *   activity
+ * @param   {Boolean}  [options.link=false]  Specifies whether javascript files
+ *   and CordovaLib framework will be symlinked to created application.
+ * @param   {String}  [options.customTemplate]  Path to project template
+ *   (override)
+ * @param   {EventEmitter}  [events]  An EventEmitter instance for logging
+ *   events
 *
- *   - `project_path` 	{String} Path to the new Cordova android project.
- *   - `package_name`{String} Package name, following reverse-domain style convention.
- *   - `project_name` 	{String} Project name.
- *   - `activity_name` {String} Name for the activity
- *   - 'project_template_dir' {String} Path to project template (override).
- *
- * Returns a promise.
+ * @return  {Promise<String>}  Directory where application has been created
 */
+exports.create = function(project_path, config, options, events) {
+
+    options = options || {};

-exports.createProject = function(project_path, package_name, project_name, activity_name, project_template_dir, use_shared_project, use_cli_template) {
    // Set default values for path, package and name
-    project_path = typeof project_path !== 'undefined' ? project_path : 'CordovaExample';
-    project_path = path.relative(process.cwd(), project_path);
-    package_name = typeof package_name !== 'undefined' ? package_name : 'my.cordova.project';
-    project_name = typeof project_name !== 'undefined' ? project_name : 'CordovaExample';
-    project_template_dir = typeof project_template_dir !== 'undefined' ? 
-                           project_template_dir : 
-                           path.join(ROOT, 'bin', 'templates', 'project');
-
-    var package_as_path = package_name.replace(/\./g, path.sep);
-    var activity_dir    = path.join(project_path, 'src', package_as_path);
-    var safe_activity_name = typeof activity_name !== 'undefined' ? activity_name : 'MainActivity';
-    var activity_path   = path.join(activity_dir, safe_activity_name + '.java');
-    var target_api      = check_reqs.get_target();
-    var manifest_path   = path.join(project_path, 'AndroidManifest.xml');
-
+    project_path = path.relative(process.cwd(), (project_path || 'CordovaExample'));
    // Check if project already exists
    if(fs.existsSync(project_path)) {
-        return Q.reject('Project already exists! Delete and recreate');
+        return Q.reject(new CordovaError('Project already exists! Delete and recreate'));
    }

+    var package_name = config.packageName() || 'my.cordova.project';
+    var project_name = config.name() ?
+        config.name().replace(/[^\w.]/g,'_') : 'CordovaExample';
+
+    var safe_activity_name = config.android_activityName() || options.activityName || 'MainActivity';
+    var target_api      = check_reqs.get_target();
+
    //Make the package conform to Java package types
    return validatePackageName(package_name)
    .then(function() {
        validateProjectName(project_name);
    }).then(function() {
        // Log the given values for the project
-        console.log('Creating Cordova project for the Android platform:');
-        console.log('\tPath: ' + project_path);
-        console.log('\tPackage: ' + package_name);
-        console.log('\tName: ' + project_name);
-        console.log('\tActivity: ' + safe_activity_name);
-        console.log('\tAndroid target: ' + target_api);
+        events.emit('log', 'Creating Cordova project for the Android platform:');
+        events.emit('log', '\tPath: ' + project_path);
+        events.emit('log', '\tPackage: ' + package_name);
+        events.emit('log', '\tName: ' + project_name);
+        events.emit('log', '\tActivity: ' + safe_activity_name);
+        events.emit('log', '\tAndroid target: ' + target_api);

-        console.log('Copying template files...');
+        events.emit('verbose', 'Copying android template project to ' + project_path);

        setShellFatal(true, function() {
+            var project_template_dir = options.customTemplate || path.join(ROOT, 'bin', 'templates', 'project');
            // copy project template
            shell.cp('-r', path.join(project_template_dir, 'assets'), project_path);
            shell.cp('-r', path.join(project_template_dir, 'res'), project_path);
@@ -242,27 +259,34 @@ exports.createProject = function(project_path, package_name, project_name, activ
            shell.mkdir(path.join(project_path, 'libs'));

            // copy cordova.js, cordova.jar
-            copyJsAndLibrary(project_path, use_shared_project, safe_activity_name);
+            copyJsAndLibrary(project_path, options.link, safe_activity_name);

            // interpolate the activity name and package
+            var packagePath = package_name.replace(/\./g, path.sep);
+            var activity_dir = path.join(project_path, 'src', packagePath);
+            var activity_path = path.join(activity_dir, safe_activity_name + '.java');
            shell.mkdir('-p', activity_dir);
            shell.cp('-f', path.join(project_template_dir, 'Activity.java'), activity_path);
            shell.sed('-i', /__ACTIVITY__/, safe_activity_name, activity_path);
            shell.sed('-i', /__NAME__/, project_name, path.join(project_path, 'res', 'values', 'strings.xml'));
            shell.sed('-i', /__ID__/, package_name, activity_path);

-            shell.cp('-f', path.join(project_template_dir, 'AndroidManifest.xml'), manifest_path);
-            shell.sed('-i', /__ACTIVITY__/, safe_activity_name, manifest_path);
-            shell.sed('-i', /__PACKAGE__/, package_name, manifest_path);
-            shell.sed('-i', /__APILEVEL__/, target_api.split('-')[1], manifest_path);
+            var manifest = new AndroidManifest(path.join(project_template_dir, 'AndroidManifest.xml'));
+            manifest.setPackageId(package_name)
+                .setTargetSdkVersion(target_api.split('-')[1])
+                .getActivity().setName(safe_activity_name);
+
+            var manifest_path = path.join(project_path, 'AndroidManifest.xml');
+            manifest.write(manifest_path);
+
            copyScripts(project_path);
            copyBuildRules(project_path);
        });
        // Link it to local android install.
        writeProjectProperties(project_path, target_api);
        prepBuildFiles(project_path);
-        console.log(generateDoneMessage('create', use_shared_project));
-    });
+        events.emit('log', generateDoneMessage('create', options.link));
+    }).thenResolve(project_path);
 };

 function generateDoneMessage(type, link) {
@@ -274,36 +298,32 @@ function generateDoneMessage(type, link) {
    return msg;
 }

-// Attribute removed in Cordova 4.4 (CB-5447).
-function removeDebuggableFromManifest(projectPath) {
-    var manifestPath = path.join(projectPath, 'AndroidManifest.xml');
-    shell.sed('-i', /\s*android:debuggable="true"/, '', manifestPath);
-}
-
-function extractProjectNameFromManifest(projectPath) {
-    var manifestPath = path.join(projectPath, 'AndroidManifest.xml');
-    var manifestData = fs.readFileSync(manifestPath, 'utf8');
-    var m = /<activity[\s\S]*?android:name\s*=\s*"(.*?)"/i.exec(manifestData);
-    if (!m) {
-      throw new Error('Could not find activity name in ' + manifestPath);
-    }
-    return m[1];
-}
-
 // Returns a promise.
-exports.updateProject = function(projectPath, shared) {
+exports.update = function(projectPath, options, events) {
+    options = options || {};
+
    return Q()
    .then(function() {
-        var projectName = extractProjectNameFromManifest(projectPath);
+
+        var manifest = new AndroidManifest(path.join(projectPath, 'AndroidManifest.xml'));
+
+        if (Number(manifest.getMinSdkVersion()) < MIN_SDK_VERSION) {
+            events.emit('verbose', 'Updating minSdkVersion to ' + MIN_SDK_VERSION + ' in AndroidManifest.xml');
+            manifest.setMinSdkVersion(MIN_SDK_VERSION);
+        }
+
+        manifest.setDebuggable(false).write();
+
+        var projectName = manifest.getActivity().getName();
        var target_api = check_reqs.get_target();
-        copyJsAndLibrary(projectPath, shared, projectName);
+
+        copyJsAndLibrary(projectPath, options.link, projectName);
        copyScripts(projectPath);
        copyBuildRules(projectPath);
-        removeDebuggableFromManifest(projectPath);
        writeProjectProperties(projectPath, target_api);
        prepBuildFiles(projectPath);
-        console.log(generateDoneMessage('update', shared));
-    });
+        events.emit('log', generateDoneMessage('update', options.link));
+    }).thenResolve(projectPath);
 };


--- a/bin/node_modules/nopt/node_modules/abbrev/package.json
+++ b/bin/node_modules/nopt/node_modules/abbrev/package.json
@@ -1,31 +0,0 @@
-{
-  "name": "abbrev",
-  "version": "1.0.5",
-  "description": "Like ruby's abbrev module, but in js",
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me"
-  },
-  "main": "abbrev.js",
-  "scripts": {
-    "test": "node test.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://github.com/isaacs/abbrev-js"
-  },
-  "license": {
-    "type": "MIT",
-    "url": "https://github.com/isaacs/abbrev-js/raw/master/LICENSE"
-  },
-  "readme": "# abbrev-js\n\nJust like [ruby's Abbrev](http://apidock.com/ruby/Abbrev).\n\nUsage:\n\n    var abbrev = require(\"abbrev\");\n    abbrev(\"foo\", \"fool\", \"folding\", \"flop\");\n    \n    // returns:\n    { fl: 'flop'\n    , flo: 'flop'\n    , flop: 'flop'\n    , fol: 'folding'\n    , fold: 'folding'\n    , foldi: 'folding'\n    , foldin: 'folding'\n    , folding: 'folding'\n    , foo: 'foo'\n    , fool: 'fool'\n    }\n\nThis is handy for command-line scripts, or other cases where you want to be able to accept shorthands.\n",
-  "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/isaacs/abbrev-js/issues"
-  },
-  "homepage": "https://github.com/isaacs/abbrev-js",
-  "_id": "abbrev@1.0.5",
-  "_shasum": "5d8257bd9ebe435e698b2fa431afde4fe7b10b03",
-  "_from": "abbrev@1",
-  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
-}
--- a/bin/node_modules/nopt/package.json
+++ b/bin/node_modules/nopt/package.json
--- a/bin/node_modules/q/CONTRIBUTING.md
+++ b/bin/node_modules/q/CONTRIBUTING.md
@@ -1,40 +0,0 @@
-
-For pull requests:
-
-   Be consistent with prevalent style and design decisions.
-   Add a Jasmine spec to `specs/q-spec.js`.
-   Use `npm test` to avoid regressions.
-   Run tests in `q-spec/run.html` in as many supported browsers as you
-    can find the will to deal with.
-   Do not build minified versions; we do this each release.
-   If you would be so kind, add a note to `CHANGES.md` in an
-    appropriate section:
-
-    -   `Next Major Version` if it introduces backward incompatibilities
-        to code in the wild using documented features.
-    -   `Next Minor Version` if it adds a new feature.
-    -   `Next Patch Version` if it fixes a bug.
-
-For releases:
-
-   Run `npm test`.
-   Run tests in `q-spec/run.html` in a representative sample of every
-    browser under the sun.
-   Run `npm run cover` and make sure you're happy with the results.
-   Run `npm run minify` and be sure to commit the resulting `q.min.js`.
-   Note the Gzipped size output by the previous command, and update
-    `README.md` if it has changed to 1 significant digit.
-   Stash any local changes.
-   Update `CHANGES.md` to reflect all changes in the differences
-    between `HEAD` and the previous tagged version.  Give credit where
-    credit is due.
-   Update `README.md` to address all new, non-experimental features.
-   Update the API reference on the Wiki to reflect all non-experimental
-    features.
-   Use `npm version major|minor|patch` to update `package.json`,
-    commit, and tag the new version.
-   Use `npm publish` to send up a new release.
-   Send an email to the q-continuum mailing list announcing the new
-    release and the notes from the change log.  This helps folks
-    maintaining other package ecosystems.
-
--- a/bin/node_modules/q/benchmark/compare-with-callbacks.js
+++ b/bin/node_modules/q/benchmark/compare-with-callbacks.js
@@ -1,71 +0,0 @@
-"use strict";
-
-var Q = require("../q");
-var fs = require("fs");
-
-suite("A single simple async operation", function () {
-    bench("with an immediately-fulfilled promise", function (done) {
-        Q().then(done);
-    });
-
-    bench("with direct setImmediate usage", function (done) {
-        setImmediate(done);
-    });
-
-    bench("with direct setTimeout(…, 0)", function (done) {
-        setTimeout(done, 0);
-    });
-});
-
-suite("A fs.readFile", function () {
-    var denodeified = Q.denodeify(fs.readFile);
-
-    set("iterations", 1000);
-    set("delay", 1000);
-
-    bench("directly, with callbacks", function (done) {
-        fs.readFile(__filename, done);
-    });
-
-    bench("with Q.nfcall", function (done) {
-        Q.nfcall(fs.readFile, __filename).then(done);
-    });
-
-    bench("with a Q.denodeify'ed version", function (done) {
-        denodeified(__filename).then(done);
-    });
-
-    bench("with manual usage of deferred.makeNodeResolver", function (done) {
-        var deferred = Q.defer();
-        fs.readFile(__filename, deferred.makeNodeResolver());
-        deferred.promise.then(done);
-    });
-});
-
-suite("1000 operations in parallel", function () {
-    function makeCounter(desiredCount, ultimateCallback) {
-        var soFar = 0;
-        return function () {
-            if (++soFar === desiredCount) {
-                ultimateCallback();
-            }
-        };
-    }
-    var numberOfOps = 1000;
-
-    bench("with immediately-fulfilled promises", function (done) {
-        var counter = makeCounter(numberOfOps, done);
-
-        for (var i = 0; i < numberOfOps; ++i) {
-            Q().then(counter);
-        }
-    });
-
-    bench("with direct setImmediate usage", function (done) {
-        var counter = makeCounter(numberOfOps, done);
-
-        for (var i = 0; i < numberOfOps; ++i) {
-            setImmediate(counter);
-        }
-    });
-});
--- a/bin/node_modules/q/benchmark/scenarios.js
+++ b/bin/node_modules/q/benchmark/scenarios.js
@@ -1,36 +0,0 @@
-"use strict";
-
-var Q = require("../q");
-
-suite("Chaining", function () {
-    var numberToChain = 1000;
-
-    bench("Chaining many already-fulfilled promises together", function (done) {
-        var currentPromise = Q();
-        for (var i = 0; i < numberToChain; ++i) {
-            currentPromise = currentPromise.then(function () {
-                return Q();
-            });
-        }
-
-        currentPromise.then(done);
-    });
-
-    bench("Chaining and then fulfilling the end of the chain", function (done) {
-        var deferred = Q.defer();
-
-        var currentPromise = deferred.promise;
-        for (var i = 0; i < numberToChain; ++i) {
-            (function () {
-                var promiseToReturn = currentPromise;
-                currentPromise = Q().then(function () {
-                    return promiseToReturn;
-                });
-            }());
-        }
-
-        currentPromise.then(done);
-
-        deferred.resolve();
-    });
-});
--- a/bin/node_modules/q/package.json
+++ b/bin/node_modules/q/package.json
--- a/bin/node_modules/shelljs/package.json
+++ b/bin/node_modules/shelljs/package.json
--- a/bin/node_modules/which/README.md
+++ b/bin/node_modules/which/README.md
@@ -1,5 +0,0 @@
-The "which" util from npm's guts.
-
-Finds the first instance of a specified executable in the PATH
-environment variable.  Does not cache the results, so `hash -r` is not
-needed when the PATH changes.
--- a/bin/node_modules/which/bin/which
+++ b/bin/node_modules/which/bin/which
@@ -1,14 +0,0 @@
-#!/usr/bin/env node
-var which = require("../")
-if (process.argv.length < 3) {
-  console.error("Usage: which <thing>")
-  process.exit(1)
-}
-
-which(process.argv[2], function (er, thing) {
-  if (er) {
-    console.error(er.message)
-    process.exit(er.errno || 127)
-  }
-  console.log(thing)
-})
--- a/bin/node_modules/which/package.json
+++ b/bin/node_modules/which/package.json
@@ -1,31 +0,0 @@
-{
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me"
-  },
-  "name": "which",
-  "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.",
-  "version": "1.0.5",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-which.git"
-  },
-  "main": "which.js",
-  "bin": {
-    "which": "./bin/which"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "dependencies": {},
-  "devDependencies": {},
-  "readme": "The \"which\" util from npm's guts.\n\nFinds the first instance of a specified executable in the PATH\nenvironment variable.  Does not cache the results, so `hash -r` is not\nneeded when the PATH changes.\n",
-  "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/isaacs/node-which/issues"
-  },
-  "homepage": "https://github.com/isaacs/node-which",
-  "_id": "which@1.0.5",
-  "_from": "which@"
-}
--- a/bin/node_modules/which/which.js
+++ b/bin/node_modules/which/which.js
@@ -1,104 +0,0 @@
-module.exports = which
-which.sync = whichSync
-
-var path = require("path")
-  , fs
-  , COLON = process.platform === "win32" ? ";" : ":"
-  , isExe
-
-try {
-  fs = require("graceful-fs")
-} catch (ex) {
-  fs = require("fs")
-}
-
-if (process.platform == "win32") {
-  // On windows, there is no good way to check that a file is executable
-  isExe = function isExe () { return true }
-} else {
-  isExe = function isExe (mod, uid, gid) {
-    //console.error(mod, uid, gid);
-    //console.error("isExe?", (mod & 0111).toString(8))
-    var ret = (mod & 0001)
-        || (mod & 0010) && process.getgid && gid === process.getgid()
-        || (mod & 0100) && process.getuid && uid === process.getuid()
-    //console.error("isExe?", ret)
-    return ret
-  }
-}
-
-
-
-function which (cmd, cb) {
-  if (isAbsolute(cmd)) return cb(null, cmd)
-  var pathEnv = (process.env.PATH || "").split(COLON)
-    , pathExt = [""]
-  if (process.platform === "win32") {
-    pathEnv.push(process.cwd())
-    pathExt = (process.env.PATHEXT || ".EXE").split(COLON)
-    if (cmd.indexOf(".") !== -1) pathExt.unshift("")
-  }
-  //console.error("pathEnv", pathEnv)
-  ;(function F (i, l) {
-    if (i === l) return cb(new Error("not found: "+cmd))
-    var p = path.resolve(pathEnv[i], cmd)
-    ;(function E (ii, ll) {
-      if (ii === ll) return F(i + 1, l)
-      var ext = pathExt[ii]
-      //console.error(p + ext)
-      fs.stat(p + ext, function (er, stat) {
-        if (!er &&
-            stat &&
-            stat.isFile() &&
-            isExe(stat.mode, stat.uid, stat.gid)) {
-          //console.error("yes, exe!", p + ext)
-          return cb(null, p + ext)
-        }
-        return E(ii + 1, ll)
-      })
-    })(0, pathExt.length)
-  })(0, pathEnv.length)
-}
-
-function whichSync (cmd) {
-  if (isAbsolute(cmd)) return cmd
-  var pathEnv = (process.env.PATH || "").split(COLON)
-    , pathExt = [""]
-  if (process.platform === "win32") {
-    pathEnv.push(process.cwd())
-    pathExt = (process.env.PATHEXT || ".EXE").split(COLON)
-    if (cmd.indexOf(".") !== -1) pathExt.unshift("")
-  }
-  for (var i = 0, l = pathEnv.length; i < l; i ++) {
-    var p = path.join(pathEnv[i], cmd)
-    for (var j = 0, ll = pathExt.length; j < ll; j ++) {
-      var cur = p + pathExt[j]
-      var stat
-      try { stat = fs.statSync(cur) } catch (ex) {}
-      if (stat &&
-          stat.isFile() &&
-          isExe(stat.mode, stat.uid, stat.gid)) return cur
-    }
-  }
-  throw new Error("not found: "+cmd)
-}
-
-var isAbsolute = process.platform === "win32" ? absWin : absUnix
-
-function absWin (p) {
-  if (absUnix(p)) return true
-  // pull off the device/UNC bit from a windows path.
-  // from node's lib/path.js
-  var splitDeviceRe =
-        /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?([\\\/])?/
-    , result = splitDeviceRe.exec(p)
-    , device = result[1] || ''
-    , isUnc = device && device.charAt(1) !== ':'
-    , isAbsolute = !!result[2] || isUnc // UNC paths are always absolute
-
-  return isAbsolute
-}
-
-function absUnix (p) {
-  return p.charAt(0) === "/" || p === ""
-}
--- a/bin/templates/cordova/.jshintrc
+++ b/bin/templates/cordova/.jshintrc
@@ -0,0 +1,10 @@
+{
+    "node": true
+  , "bitwise": true
+  , "undef": true
+  , "trailing": true
+  , "quotmark": true
+  , "indent": 4
+  , "unused": "vars"
+  , "latedef": "nofunc"
+}
--- a/bin/templates/cordova/Api.js
+++ b/bin/templates/cordova/Api.js
@@ -0,0 +1,349 @@
+/**
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+
+var path = require('path');
+
+var AndroidProject = require('./lib/AndroidProject');
+var PluginManager = require('cordova-common').PluginManager;
+
+var CordovaLogger = require('cordova-common').CordovaLogger;
+var selfEvents = require('cordova-common').events;
+
+var PLATFORM = 'android';
+
+function setupEvents(externalEventEmitter) {
+    if (externalEventEmitter) {
+        // This will make the platform internal events visible outside
+        selfEvents.forwardEventsTo(externalEventEmitter);
+        return externalEventEmitter;
+    }
+
+    // There is no logger if external emitter is not present,
+    // so attach a console logger
+    CordovaLogger.get().subscribe(selfEvents);
+    return selfEvents;
+}
+
+/**
+ * Class, that acts as abstraction over particular platform. Encapsulates the
+ *   platform's properties and methods.
+ *
+ * Platform that implements own PlatformApi instance _should implement all
+ *   prototype methods_ of this class to be fully compatible with cordova-lib.
+ *
+ * The PlatformApi instance also should define the following field:
+ *
+ * * platform: String that defines a platform name.
+ */
+function Api(platform, platformRootDir, events) {
+    this.platform = PLATFORM;
+    this.root = path.resolve(__dirname, '..');
+
+    setupEvents(events);
+
+    var self = this;
+
+    this.locations = {
+        root: self.root,
+        www: path.join(self.root, 'assets/www'),
+        platformWww: path.join(self.root, 'platform_www'),
+        configXml: path.join(self.root, 'res/xml/config.xml'),
+        defaultConfigXml: path.join(self.root, 'cordova/defaults.xml'),
+        strings: path.join(self.root, 'res/values/strings.xml'),
+        manifest: path.join(self.root, 'AndroidManifest.xml'),
+        // NOTE: Due to platformApi spec we need to return relative paths here
+        cordovaJs: 'bin/templates/project/assets/www/cordova.js',
+        cordovaJsSrc: 'cordova-js-src'
+    };
+}
+
+/**
+ * Installs platform to specified directory and creates a platform project.
+ *
+ * @param  {String}  destination Destination directory, where insatll platform to
+ * @param  {ConfigParser}  [config] ConfgiParser instance, used to retrieve
+ *   project creation options, such as package id and project name.
+ * @param  {Object}  [options]  An options object. The most common options are:
+ * @param  {String}  [options.customTemplate]  A path to custom template, that
+ *   should override the default one from platform.
+ * @param  {Boolean}  [options.link]  Flag that indicates that platform's
+ *   sources will be linked to installed platform instead of copying.
+ * @param {EventEmitter} [events] An EventEmitter instance that will be used for
+ *   logging purposes. If no EventEmitter provided, all events will be logged to
+ *   console
+ *
+ * @return {Promise<PlatformApi>} Promise either fulfilled with PlatformApi
+ *   instance or rejected with CordovaError.
+ */
+Api.createPlatform = function (destination, config, options, events) {
+    events = setupEvents(events);
+
+    return require('../../lib/create')
+    .create(destination, config, options, events)
+    .then(function (destination) {
+        var PlatformApi = require(path.resolve(destination, 'cordova/Api'));
+        return new PlatformApi(PLATFORM, destination, events);
+    });
+};
+
+/**
+ * Updates already installed platform.
+ *
+ * @param  {String}  destination Destination directory, where platform installed
+ * @param  {Object}  [options]  An options object. The most common options are:
+ * @param  {String}  [options.customTemplate]  A path to custom template, that
+ *   should override the default one from platform.
+ * @param  {Boolean}  [options.link]  Flag that indicates that platform's
+ *   sources will be linked to installed platform instead of copying.
+ * @param {EventEmitter} [events] An EventEmitter instance that will be used for
+ *   logging purposes. If no EventEmitter provided, all events will be logged to
+ *   console
+ *
+ * @return {Promise<PlatformApi>} Promise either fulfilled with PlatformApi
+ *   instance or rejected with CordovaError.
+ */
+Api.updatePlatform = function (destination, options, events) {
+    events = setupEvents(events);
+
+    return require('../../lib/create')
+    .update(destination, options, events)
+    .then(function (destination) {
+        var PlatformApi = require(path.resolve(destination, 'cordova/Api'));
+        return new PlatformApi('android', destination, events);
+    });
+};
+
+/**
+ * Gets a CordovaPlatform object, that represents the platform structure.
+ *
+ * @return  {CordovaPlatform}  A structure that contains the description of
+ *   platform's file structure and other properties of platform.
+ */
+Api.prototype.getPlatformInfo = function () {
+    var result = {};
+    result.locations = this.locations;
+    result.root = this.root;
+    result.name = this.platform;
+    result.version = require('./version');
+    result.projectConfig = this._config;
+
+    return result;
+};
+
+/**
+ * Updates installed platform with provided www assets and new app
+ *   configuration. This method is required for CLI workflow and will be called
+ *   each time before build, so the changes, made to app configuration and www
+ *   code, will be applied to platform.
+ *
+ * @param {CordovaProject} cordovaProject A CordovaProject instance, that defines a
+ *   project structure and configuration, that should be applied to platform
+ *   (contains project's www location and ConfigParser instance for project's
+ *   config).
+ *
+ * @return  {Promise}  Return a promise either fulfilled, or rejected with
+ *   CordovaError instance.
+ */
+Api.prototype.prepare = function (cordovaProject, prepareOptions) {
+    return require('./lib/prepare').prepare.call(this, cordovaProject, prepareOptions);
+};
+
+/**
+ * Installs a new plugin into platform. This method only copies non-www files
+ *   (sources, libs, etc.) to platform. It also doesn't resolves the
+ *   dependencies of plugin. Both of handling of www files, such as assets and
+ *   js-files and resolving dependencies are the responsibility of caller.
+ *
+ * @param  {PluginInfo}  plugin  A PluginInfo instance that represents plugin
+ *   that will be installed.
+ * @param  {Object}  installOptions  An options object. Possible options below:
+ * @param  {Boolean}  installOptions.link: Flag that specifies that plugin
+ *   sources will be symlinked to app's directory instead of copying (if
+ *   possible).
+ * @param  {Object}  installOptions.variables  An object that represents
+ *   variables that will be used to install plugin. See more details on plugin
+ *   variables in documentation:
+ *   https://cordova.apache.org/docs/en/4.0.0/plugin_ref_spec.md.html
+ *
+ * @return  {Promise}  Return a promise either fulfilled, or rejected with
+ *   CordovaError instance.
+ */
+Api.prototype.addPlugin = function (plugin, installOptions) {
+    var project = AndroidProject.getProjectFile(this.root);
+
+    installOptions = installOptions || {};
+    installOptions.variables = installOptions.variables || {};
+    // Add PACKAGE_NAME variable into vars
+    if (!installOptions.variables.PACKAGE_NAME) {
+        installOptions.variables.PACKAGE_NAME = project.getPackageName();
+    }
+
+    return PluginManager.get(this.platform, this.locations, project)
+        .addPlugin(plugin, installOptions)
+        .then(function () {
+            if (plugin.getFrameworks(this.platform).length === 0) return;
+
+            selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>');
+            require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles();
+        }.bind(this))
+        // CB-11022 Return truthy value to prevent running prepare after
+        .thenResolve(true);
+};
+
+/**
+ * Removes an installed plugin from platform.
+ *
+ * Since method accepts PluginInfo instance as input parameter instead of plugin
+ *   id, caller shoud take care of managing/storing PluginInfo instances for
+ *   future uninstalls.
+ *
+ * @param  {PluginInfo}  plugin  A PluginInfo instance that represents plugin
+ *   that will be installed.
+ *
+ * @return  {Promise}  Return a promise either fulfilled, or rejected with
+ *   CordovaError instance.
+ */
+Api.prototype.removePlugin = function (plugin, uninstallOptions) {
+    var project = AndroidProject.getProjectFile(this.root);
+    return PluginManager.get(this.platform, this.locations, project)
+        .removePlugin(plugin, uninstallOptions)
+        .then(function () {
+            if (plugin.getFrameworks(this.platform).length === 0) return;
+
+            selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>');
+            require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles();
+        }.bind(this))
+        // CB-11022 Return truthy value to prevent running prepare after
+        .thenResolve(true);
+};
+
+/**
+ * Builds an application package for current platform.
+ *
+ * @param  {Object}  buildOptions  A build options. This object's structure is
+ *   highly depends on platform's specific. The most common options are:
+ * @param  {Boolean}  buildOptions.debug  Indicates that packages should be
+ *   built with debug configuration. This is set to true by default unless the
+ *   'release' option is not specified.
+ * @param  {Boolean}  buildOptions.release  Indicates that packages should be
+ *   built with release configuration. If not set to true, debug configuration
+ *   will be used.
+ * @param   {Boolean}  buildOptions.device  Specifies that built app is intended
+ *   to run on device
+ * @param   {Boolean}  buildOptions.emulator: Specifies that built app is
+ *   intended to run on emulator
+ * @param   {String}  buildOptions.target  Specifies the device id that will be
+ *   used to run built application.
+ * @param   {Boolean}  buildOptions.nobuild  Indicates that this should be a
+ *   dry-run call, so no build artifacts will be produced.
+ * @param   {String[]}  buildOptions.archs  Specifies chip architectures which
+ *   app packages should be built for. List of valid architectures is depends on
+ *   platform.
+ * @param   {String}  buildOptions.buildConfig  The path to build configuration
+ *   file. The format of this file is depends on platform.
+ * @param   {String[]} buildOptions.argv Raw array of command-line arguments,
+ *   passed to `build` command. The purpose of this property is to pass a
+ *   platform-specific arguments, and eventually let platform define own
+ *   arguments processing logic.
+ *
+ * @return {Promise<Object[]>} A promise either fulfilled with an array of build
+ *   artifacts (application packages) if package was built successfully,
+ *   or rejected with CordovaError. The resultant build artifact objects is not
+ *   strictly typed and may conatin arbitrary set of fields as in sample below.
+ *
+ *     {
+ *         architecture: 'x86',
+ *         buildType: 'debug',
+ *         path: '/path/to/build',
+ *         type: 'app'
+ *     }
+ *
+ * The return value in most cases will contain only one item but in some cases
+ *   there could be multiple items in output array, e.g. when multiple
+ *   arhcitectures is specified.
+ */
+Api.prototype.build = function (buildOptions) {
+    var self = this;
+    return require('./lib/check_reqs').run()
+    .then(function () {
+        return require('./lib/build').run.call(self, buildOptions);
+    })
+    .then(function (buildResults) {
+        // Cast build result to array of build artifacts
+        return buildResults.apkPaths.map(function (apkPath) {
+            return {
+                buildType: buildResults.buildType,
+                buildMethod: buildResults.buildMethod,
+                path: apkPath,
+                type: 'apk'
+            };
+        });
+    });
+};
+
+/**
+ * Builds an application package for current platform and runs it on
+ *   specified/default device. If no 'device'/'emulator'/'target' options are
+ *   specified, then tries to run app on default device if connected, otherwise
+ *   runs the app on emulator.
+ *
+ * @param   {Object}  runOptions  An options object. The structure is the same
+ *   as for build options.
+ *
+ * @return {Promise} A promise either fulfilled if package was built and ran
+ *   successfully, or rejected with CordovaError.
+ */
+Api.prototype.run = function(runOptions) {
+    var self = this;
+    return require('./lib/check_reqs').run()
+    .then(function () {
+        return require('./lib/run').run.call(self, runOptions);
+    });
+};
+
+/**
+ * Cleans out the build artifacts from platform's directory.
+ *
+ * @return  {Promise}  Return a promise either fulfilled, or rejected with
+ *   CordovaError.
+ */
+Api.prototype.clean = function(cleanOptions) {
+    var self = this;
+    return require('./lib/check_reqs').run()
+    .then(function () {
+        return require('./lib/build').runClean.call(self, cleanOptions);
+    })
+    .then(function () {
+        return require('./lib/prepare').clean.call(self, cleanOptions);
+    });
+};
+
+/**
+ * Performs a requirements check for current platform. Each platform defines its
+ *   own set of requirements, which should be resolved before platform can be
+ *   built successfully.
+ *
+ * @return  {Promise<Requirement[]>}  Promise, resolved with set of Requirement
+ *   objects for current platform.
+ */
+Api.prototype.requirements = function() {
+    return require('./lib/check_reqs').check_all();
+};
+
+module.exports = Api;
--- a/bin/templates/cordova/build
+++ b/bin/templates/cordova/build
@@ -19,23 +19,32 @@
       under the License.
 */

-var build = require('./lib/build'),
-    reqs  = require('./lib/check_reqs'),
-    args  = process.argv;
+var args  = process.argv;
+var Api = require('./Api');
+var nopt = require('nopt');
+var path = require('path');

 // Support basic help commands
-if(args[2] == '--help' ||
-   args[2] == '/?' ||
-   args[2] == '-h' ||
-   args[2] == 'help' ||
-   args[2] == '-help' ||
-   args[2] == '/help') {
-    build.help();
-} else {
-    reqs.run().done(function() {
-        return build.run(args.slice(2));
-    }, function(err) {
-        console.error(err);
-        process.exit(2);
-    });
-}
+if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0)
+    require('./lib/build').help();
+
+// Do some basic argument parsing
+var buildOpts = nopt({
+    'verbose' : Boolean,
+    'silent' : Boolean,
+    'debug' : Boolean,
+    'release' : Boolean,
+    'nobuild': Boolean,
+    'buildConfig' : path
+}, { 'd' : '--verbose' });
+
+// Make buildOptions compatible with PlatformApi build method spec
+buildOpts.argv = buildOpts.argv.original;
+
+require('./loggingHelper').adjustLoggerLevel(buildOpts);
+
+new Api().build(buildOpts)
+.catch(function(err) {
+    console.error(err.stack);
+    process.exit(2);
+});
--- a/bin/templates/cordova/clean
+++ b/bin/templates/cordova/clean
@@ -19,26 +19,33 @@
       under the License.
 */

-var build = require('./lib/build'),
-    reqs  = require('./lib/check_reqs'),
-    args  = process.argv;
+var Api = require('./Api');
 var path  = require('path');
+var nopt = require('nopt');

 // Support basic help commands
-if(args[2] == '--help' ||
-   args[2] == '/?' ||
-   args[2] == '-h' ||
-   args[2] == 'help' ||
-   args[2] == '-help' ||
-   args[2] == '/help') {
+if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) {
    console.log('Usage: ' + path.relative(process.cwd(), process.argv[1]));
    console.log('Cleans the project directory.');
    process.exit(0);
-} else {
-    reqs.run().done(function() {
-        return build.runClean(args.slice(2));
-    }, function(err) {
-        console.error(err);
-        process.exit(2);
-    });
 }
+
+// Do some basic argument parsing
+var opts = nopt({
+    'verbose' : Boolean,
+    'silent' : Boolean
+}, { 'd' : '--verbose' });
+
+// Make buildOptions compatible with PlatformApi clean method spec
+opts.argv = opts.argv.original;
+
+// Skip cleaning prepared files when not invoking via cordova CLI.
+opts.noPrepare = true;
+
+require('./loggingHelper').adjustLoggerLevel(opts);
+
+new Api().clean(opts)
+.catch(function(err) {
+    console.error(err.stack);
+    process.exit(2);
+});
--- a/bin/templates/cordova/lib/Adb.js
+++ b/bin/templates/cordova/lib/Adb.js
@@ -0,0 +1,105 @@
+/**
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+
+var Q = require('q');
+var os = require('os');
+var events = require('cordova-common').events;
+var spawn = require('cordova-common').superspawn.spawn;
+var CordovaError = require('cordova-common').CordovaError;
+
+var Adb = {};
+
+function isDevice(line) {
+    return line.match(/\w+\tdevice/) && !line.match(/emulator/);
+}
+
+function isEmulator(line) {
+    return line.match(/device/) && line.match(/emulator/);
+}
+
+/**
+ * Lists available/connected devices and emulators
+ *
+ * @param   {Object}   opts            Various options
+ * @param   {Boolean}  opts.emulators  Specifies whether this method returns
+ *   emulators only
+ *
+ * @return  {Promise<String[]>}        list of available/connected
+ *   devices/emulators
+ */
+Adb.devices = function (opts) {
+    return spawn('adb', ['devices'], {cwd: os.tmpdir()})
+    .then(function(output) {
+        return output.split('\n').filter(function (line) {
+            // Filter out either real devices or emulators, depending on options
+            return (line && opts && opts.emulators) ? isEmulator(line) : isDevice(line);
+        }).map(function (line) {
+            return line.replace(/\tdevice/, '').replace('\r', '');
+        });
+    });
+};
+
+Adb.install = function (target, packagePath, opts) {
+    events.emit('verbose', 'Installing apk ' + packagePath + ' on target ' + target + '...');
+    var args = ['-s', target, 'install'];
+    if (opts && opts.replace) args.push('-r');
+    return spawn('adb', args.concat(packagePath), {cwd: os.tmpdir()})
+    .then(function(output) {
+        // 'adb install' seems to always returns no error, even if installation fails
+        // so we catching output to detect installation failure
+        if (output.match(/Failure/)) {
+            if (output.match(/INSTALL_PARSE_FAILED_NO_CERTIFICATES/)) {
+                output += '\n\n' + 'Sign the build using \'-- --keystore\' or \'--buildConfig\'' +
+                    ' or sign and deploy the unsigned apk manually using Android tools.';
+            } else if (output.match(/INSTALL_FAILED_VERSION_DOWNGRADE/)) {
+                output += '\n\n' + 'You\'re trying to install apk with a lower versionCode that is already installed.' +
+                    '\nEither uninstall an app or increment the versionCode.';
+            }
+
+            return Q.reject(new CordovaError('Failed to install apk to device: ' + output));
+        }
+    });
+};
+
+Adb.uninstall = function (target, packageId) {
+    events.emit('verbose', 'Uninstalling package ' + packageId + ' from target ' + target + '...');
+    return spawn('adb', ['-s', target, 'uninstall', packageId], {cwd: os.tmpdir()});
+};
+
+Adb.shell = function (target, shellCommand) {
+    events.emit('verbose', 'Running adb shell command "' + shellCommand + '" on target ' + target + '...');
+    var args = ['-s', target, 'shell'];
+    shellCommand = shellCommand.split(/\s+/);
+    return spawn('adb', args.concat(shellCommand), {cwd: os.tmpdir()})
+    .catch(function (output) {
+        return Q.reject(new CordovaError('Failed to execute shell command "' +
+            shellCommand + '"" on device: ' + output));
+    });
+};
+
+Adb.start = function (target, activityName) {
+    events.emit('verbose', 'Starting application "' + activityName + '" on target ' + target + '...');
+    return Adb.shell(target, 'am start -W -a android.intent.action.MAIN -n' + activityName)
+    .catch(function (output) {
+        return Q.reject(new CordovaError('Failed to start application "' +
+            activityName + '"" on device: ' + output));
+    });
+};
+
+module.exports = Adb;
--- a/bin/templates/cordova/lib/AndroidManifest.js
+++ b/bin/templates/cordova/lib/AndroidManifest.js
@@ -0,0 +1,161 @@
+/**
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+
+var fs = require('fs');
+var et = require('elementtree');
+var xml= require('cordova-common').xmlHelpers;
+
+var DEFAULT_ORIENTATION = 'default';
+
+/** Wraps an AndroidManifest file */
+function AndroidManifest(path) {
+    this.path = path;
+    this.doc = xml.parseElementtreeSync(path);
+    if (this.doc.getroot().tag !== 'manifest') {
+        throw new Error('AndroidManifest at ' + path + ' has incorrect root node name (expected "manifest")');
+    }
+}
+
+AndroidManifest.prototype.getVersionName = function() {
+    return this.doc.getroot().attrib['android:versionName'];
+};
+
+AndroidManifest.prototype.setVersionName = function(versionName) {
+    this.doc.getroot().attrib['android:versionName'] = versionName;
+    return this;
+};
+
+AndroidManifest.prototype.getVersionCode = function() {
+    return this.doc.getroot().attrib['android:versionCode'];
+};
+
+AndroidManifest.prototype.setVersionCode = function(versionCode) {
+    this.doc.getroot().attrib['android:versionCode'] = versionCode;
+    return this;
+};
+
+AndroidManifest.prototype.getPackageId = function() {
+    /*jshint -W069 */
+    return this.doc.getroot().attrib['package'];
+    /*jshint +W069 */
+};
+
+AndroidManifest.prototype.setPackageId = function(pkgId) {
+    /*jshint -W069 */
+    this.doc.getroot().attrib['package'] = pkgId;
+    /*jshint +W069 */
+    return this;
+};
+
+AndroidManifest.prototype.getActivity = function() {
+    var activity = this.doc.getroot().find('./application/activity');
+    return {
+        getName: function () {
+            return activity.attrib['android:name'];
+        },
+        setName: function (name) {
+            if (!name) {
+                delete activity.attrib['android:name'];
+            } else {
+                activity.attrib['android:name'] = name;
+            }
+            return this;
+        },
+        getOrientation: function () {
+            return activity.attrib['android:screenOrientation'];
+        },
+        setOrientation: function (orientation) {
+            if (!orientation || orientation.toLowerCase() === DEFAULT_ORIENTATION) {
+                delete activity.attrib['android:screenOrientation'];
+            } else {
+                activity.attrib['android:screenOrientation'] = orientation;
+            }
+            return this;
+        },
+        getLaunchMode: function () {
+            return activity.attrib['android:launchMode'];
+        },
+        setLaunchMode: function (launchMode) {
+            if (!launchMode) {
+                delete activity.attrib['android:launchMode'];
+            } else {
+                activity.attrib['android:launchMode'] = launchMode;
+            }
+            return this;
+        }
+    };
+};
+
+['minSdkVersion', 'maxSdkVersion', 'targetSdkVersion']
+.forEach(function(sdkPrefName) {
+    // Copy variable reference to avoid closure issues
+    var prefName = sdkPrefName;
+
+    AndroidManifest.prototype['get' + capitalize(prefName)] = function() {
+        var usesSdk = this.doc.getroot().find('./uses-sdk');
+        return usesSdk && usesSdk.attrib['android:' + prefName];
+    };
+
+    AndroidManifest.prototype['set' + capitalize(prefName)] = function(prefValue) {
+        var usesSdk = this.doc.getroot().find('./uses-sdk');
+
+        if (!usesSdk && prefValue) { // if there is no required uses-sdk element, we should create it first
+            usesSdk = new et.Element('uses-sdk');
+            this.doc.getroot().append(usesSdk);
+        }
+
+        if (prefValue) {
+            usesSdk.attrib['android:' + prefName] = prefValue;
+        }
+
+        return this;
+    };
+});
+
+AndroidManifest.prototype.getDebuggable = function() {
+    return this.doc.getroot().find('./application').attrib['android:debuggable'] === 'true';
+};
+
+AndroidManifest.prototype.setDebuggable = function(value) {
+    var application = this.doc.getroot().find('./application');
+    if (value) {
+        application.attrib['android:debuggable'] = 'true';
+    } else {
+        // The default value is "false", so we can remove attribute at all.
+        delete application.attrib['android:debuggable'];
+    }
+    return this;
+};
+
+/**
+ * Writes manifest to disk syncronously. If filename is specified, then manifest
+ *   will be written to that file
+ *
+ * @param   {String}  [destPath]  File to write manifest to. If omitted,
+ *   manifest will be written to file it has been read from.
+ */
+AndroidManifest.prototype.write = function(destPath) {
+    fs.writeFileSync(destPath || this.path, this.doc.write({indent: 4}), 'utf-8');
+};
+
+module.exports = AndroidManifest;
+
+function capitalize (str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+}
--- a/bin/templates/cordova/lib/AndroidProject.js
+++ b/bin/templates/cordova/lib/AndroidProject.js
@@ -0,0 +1,193 @@
+/**
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+
+var fs = require('fs');
+var path = require('path');
+var properties_parser = require('properties-parser');
+var AndroidManifest = require('./AndroidManifest');
+var pluginHandlers = require('./pluginHandlers');
+
+var projectFileCache = {};
+
+function addToPropertyList(projectProperties, key, value) {
+    var i = 1;
+    while (projectProperties.get(key + '.' + i))
+        i++;
+
+    projectProperties.set(key + '.' + i, value);
+    projectProperties.dirty = true;
+}
+
+function removeFromPropertyList(projectProperties, key, value) {
+    var i = 1;
+    var currentValue;
+    while ((currentValue = projectProperties.get(key + '.' + i))) {
+        if (currentValue === value) {
+            while ((currentValue = projectProperties.get(key + '.' + (i + 1)))) {
+                projectProperties.set(key + '.' + i, currentValue);
+                i++;
+            }
+            projectProperties.set(key + '.' + i);
+            break;
+        }
+        i++;
+    }
+    projectProperties.dirty = true;
+}
+
+function getRelativeLibraryPath (parentDir, subDir) {
+    var libraryPath = path.relative(parentDir, subDir);
+    return (path.sep == '\\') ? libraryPath.replace(/\\/g, '/') : libraryPath;
+}
+
+function AndroidProject(projectDir) {
+    this._propertiesEditors = {};
+    this._subProjectDirs = {};
+    this._dirty = false;
+    this.projectDir = projectDir;
+    this.platformWww = path.join(this.projectDir, 'platform_www');
+    this.www = path.join(this.projectDir, 'assets/www');
+}
+
+AndroidProject.getProjectFile = function (projectDir) {
+    if (!projectFileCache[projectDir]) {
+        projectFileCache[projectDir] = new AndroidProject(projectDir);
+    }
+
+    return projectFileCache[projectDir];
+};
+
+AndroidProject.purgeCache = function (projectDir) {
+    if (projectDir) {
+        delete projectFileCache[projectDir];
+    } else {
+        projectFileCache = {};
+    }
+};
+
+/**
+ * Reads the package name out of the Android Manifest file
+ *
+ * @param   {String}  projectDir  The absolute path to the directory containing the project
+ *
+ * @return  {String}              The name of the package
+ */
+AndroidProject.prototype.getPackageName = function() {
+    return new AndroidManifest(path.join(this.projectDir, 'AndroidManifest.xml')).getPackageId();
+};
+
+AndroidProject.prototype.getCustomSubprojectRelativeDir = function(plugin_id, src) {
+    // All custom subprojects are prefixed with the last portion of the package id.
+    // This is to avoid collisions when opening multiple projects in Eclipse that have subprojects with the same name.
+    var packageName = this.getPackageName();
+    var lastDotIndex = packageName.lastIndexOf('.');
+    var prefix = packageName.substring(lastDotIndex + 1);
+    var subRelativeDir = path.join(plugin_id, prefix + '-' + path.basename(src));
+    return subRelativeDir;
+};
+
+AndroidProject.prototype.addSubProject = function(parentDir, subDir) {
+    var parentProjectFile = path.resolve(parentDir, 'project.properties');
+    var subProjectFile = path.resolve(subDir, 'project.properties');
+    var parentProperties = this._getPropertiesFile(parentProjectFile);
+    // TODO: Setting the target needs to happen only for pre-3.7.0 projects
+    if (fs.existsSync(subProjectFile)) {
+        var subProperties = this._getPropertiesFile(subProjectFile);
+        subProperties.set('target', parentProperties.get('target'));
+        subProperties.dirty = true;
+        this._subProjectDirs[subDir] = true;
+    }
+    addToPropertyList(parentProperties, 'android.library.reference', getRelativeLibraryPath(parentDir, subDir));
+
+    this._dirty = true;
+};
+
+AndroidProject.prototype.removeSubProject = function(parentDir, subDir) {
+    var parentProjectFile = path.resolve(parentDir, 'project.properties');
+    var parentProperties = this._getPropertiesFile(parentProjectFile);
+    removeFromPropertyList(parentProperties, 'android.library.reference', getRelativeLibraryPath(parentDir, subDir));
+    delete this._subProjectDirs[subDir];
+    this._dirty = true;
+};
+
+AndroidProject.prototype.addGradleReference = function(parentDir, subDir) {
+    var parentProjectFile = path.resolve(parentDir, 'project.properties');
+    var parentProperties = this._getPropertiesFile(parentProjectFile);
+    addToPropertyList(parentProperties, 'cordova.gradle.include', getRelativeLibraryPath(parentDir, subDir));
+    this._dirty = true;
+};
+
+AndroidProject.prototype.removeGradleReference = function(parentDir, subDir) {
+    var parentProjectFile = path.resolve(parentDir, 'project.properties');
+    var parentProperties = this._getPropertiesFile(parentProjectFile);
+    removeFromPropertyList(parentProperties, 'cordova.gradle.include', getRelativeLibraryPath(parentDir, subDir));
+    this._dirty = true;
+};
+
+AndroidProject.prototype.addSystemLibrary = function(parentDir, value) {
+    var parentProjectFile = path.resolve(parentDir, 'project.properties');
+    var parentProperties = this._getPropertiesFile(parentProjectFile);
+    addToPropertyList(parentProperties, 'cordova.system.library', value);
+    this._dirty = true;
+};
+
+AndroidProject.prototype.removeSystemLibrary = function(parentDir, value) {
+    var parentProjectFile = path.resolve(parentDir, 'project.properties');
+    var parentProperties = this._getPropertiesFile(parentProjectFile);
+    removeFromPropertyList(parentProperties, 'cordova.system.library', value);
+    this._dirty = true;
+};
+
+AndroidProject.prototype.write = function() {
+    if (!this._dirty) {
+        return;
+    }
+    this._dirty = false;
+
+    for (var filename in this._propertiesEditors) {
+        var editor = this._propertiesEditors[filename];
+        if (editor.dirty) {
+            fs.writeFileSync(filename, editor.toString());
+            editor.dirty = false;
+        }
+    }
+};
+
+AndroidProject.prototype._getPropertiesFile = function (filename) {
+    if (!this._propertiesEditors[filename]) {
+        if (fs.existsSync(filename)) {
+            this._propertiesEditors[filename] = properties_parser.createEditor(filename);
+        } else {
+            this._propertiesEditors[filename] = properties_parser.createEditor();
+        }
+    }
+
+    return this._propertiesEditors[filename];
+};
+
+AndroidProject.prototype.getInstaller = function (type) {
+    return pluginHandlers.getInstaller(type);
+};
+
+AndroidProject.prototype.getUninstaller = function (type) {
+    return pluginHandlers.getUninstaller(type);
+};
+
+
+module.exports = AndroidProject;
--- a/bin/templates/cordova/lib/appinfo.js
+++ b/bin/templates/cordova/lib/appinfo.js
@@ -1,41 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var path = require('path');
-var fs = require('fs');
-var cachedAppInfo = null;
-
-function readAppInfoFromManifest() {
-    var manifestPath = path.join(__dirname, '..', '..', 'AndroidManifest.xml');
-    var manifestData = fs.readFileSync(manifestPath, {encoding:'utf8'});
-    var packageName = /\bpackage\s*=\s*"(.+?)"/.exec(manifestData);
-    if (!packageName) throw new Error('Could not find package name within ' + manifestPath);
-    var activityTag = /<activity\b[\s\S]*<\/activity>/.exec(manifestData);
-    if (!activityTag) throw new Error('Could not find <activity> within ' + manifestPath);
-    var activityName = /\bandroid:name\s*=\s*"(.+?)"/.exec(activityTag);
-    if (!activityName) throw new Error('Could not find android:name within ' + manifestPath);
-
-    return packageName[1] + '/.' + activityName[1];
-}
-
-exports.getActivityName = function() {
-    return (cachedAppInfo = cachedAppInfo || readAppInfoFromManifest());
-};
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -19,493 +19,86 @@
       under the License.
 */

-/* jshint sub:true */
-
-var shell   = require('shelljs'),
-    spawn   = require('./spawn'),
-    Q       = require('q'),
+var Q       = require('q'),
    path    = require('path'),
    fs      = require('fs'),
-    os      = require('os'),
-    ROOT    = path.join(__dirname, '..', '..');
-var check_reqs = require('./check_reqs');
-var exec  = require('./exec');
+    nopt = require('nopt');

+var Adb = require('./Adb');

-var SIGNING_PROPERTIES = '-signing.properties';
-var MARKER = 'YOUR CHANGES WILL BE ERASED!';
-var TEMPLATE =
-    '# This file is automatically generated.\n' +
-    '# Do not modify this file -- ' + MARKER + '\n';
+var builders = require('./builders/builders');
+var events = require('cordova-common').events;
+var spawn = require('cordova-common').superspawn.spawn;
+var CordovaError = require('cordova-common').CordovaError;

-function findApks(directory) {
-    var ret = [];
-    if (fs.existsSync(directory)) {
-        fs.readdirSync(directory).forEach(function(p) {
-            if (path.extname(p) == '.apk') {
-                ret.push(path.join(directory, p));
-            }
-        });
-    }
-    return ret;
-}
-
-function sortFilesByDate(files) {
-    return files.map(function(p) {
-        return { p: p, t: fs.statSync(p).mtime };
-    }).sort(function(a, b) {
-        var timeDiff = b.t - a.t;
-        return timeDiff === 0 ? a.p.length - b.p.length : timeDiff;
-    }).map(function(p) { return p.p; });
-}
-
-function isAutoGenerated(file) {
-    if(fs.existsSync(file)) {
-        var fileContents = fs.readFileSync(file, 'utf8');
-        return fileContents.indexOf(MARKER) > 0;
-    }
-    return false;
-}
-
-function findOutputApksHelper(dir, build_type, arch) {
-    var ret = findApks(dir).filter(function(candidate) {
-        // Need to choose between release and debug .apk.
-        if (build_type === 'debug') {
-            return /-debug/.exec(candidate) && !/-unaligned|-unsigned/.exec(candidate);
-        }
-        if (build_type === 'release') {
-            return /-release/.exec(candidate) && !/-unaligned|-unsigned/.exec(candidate);
-        }
-        return true;
-    });
-    ret = sortFilesByDate(ret);
-    if (ret.length === 0) {
-        return ret;
-    }
-    // Assume arch-specific build if newest api has -x86 or -arm.
-    var archSpecific = !!/-x86|-arm/.exec(ret[0]);
-    // And show only arch-specific ones (or non-arch-specific)
-    ret = ret.filter(function(p) {
-        /*jshint -W018 */
-        return !!/-x86|-arm/.exec(p) == archSpecific;
-        /*jshint +W018 */
-    });
-    if (arch && ret.length > 1) {
-        ret = ret.filter(function(p) {
-            return p.indexOf('-' + arch) != -1;
-        });
-    }
-    return ret;
-}
-
-function hasCustomRules() {
-    return fs.existsSync(path.join(ROOT, 'custom_rules.xml'));
-}
-
-function extractRealProjectNameFromManifest(projectPath) {
-    var manifestPath = path.join(projectPath, 'AndroidManifest.xml');
-    var manifestData = fs.readFileSync(manifestPath, 'utf8');
-    var m = /<manifest[\s\S]*?package\s*=\s*"(.*?)"/i.exec(manifestData);
-    if (!m) {
-        throw new Error('Could not find package name in ' + manifestPath);
-    }
-
-    var packageName=m[1];
-    var lastDotIndex = packageName.lastIndexOf('.');
-    return packageName.substring(lastDotIndex + 1);
-}
-
-function extractProjectNameFromManifest(projectPath) {
-    var manifestPath = path.join(projectPath, 'AndroidManifest.xml');
-    var manifestData = fs.readFileSync(manifestPath, 'utf8');
-    var m = /<activity[\s\S]*?android:name\s*=\s*"(.*?)"/i.exec(manifestData);
-    if (!m) {
-        throw new Error('Could not find activity name in ' + manifestPath);
-    }
-    return m[1];
-}
-
-function findAllUniq(data, r) {
-    var s = {};
-    var m;
-    while ((m = r.exec(data))) {
-        s[m[1]] = 1;
-    }
-    return Object.keys(s);
-}
-
-function readProjectProperties() {
-    var data = fs.readFileSync(path.join(ROOT, 'project.properties'), 'utf8');
-    return {
-        libs: findAllUniq(data, /^\s*android\.library\.reference\.\d+=(.*)(?:\s|$)/mg),
-        gradleIncludes: findAllUniq(data, /^\s*cordova\.gradle\.include\.\d+=(.*)(?:\s|$)/mg),
-        systemLibs: findAllUniq(data, /^\s*cordova\.system\.library\.\d+=(.*)(?:\s|$)/mg)
-    };
-}
-
-var builders = {
-    ant: {
-        getArgs: function(cmd, opts) {
-            var args = [cmd, '-f', path.join(ROOT, 'build.xml')];
-            // custom_rules.xml is required for incremental builds.
-            if (hasCustomRules()) {
-                args.push('-Dout.dir=ant-build', '-Dgen.absolute.dir=ant-gen');
-            }
-            if(opts.packageInfo) {
-                args.push('-propertyfile=' + path.join(ROOT, opts.buildType + SIGNING_PROPERTIES));
-            }
-            return args;
-        },
-
-        prepEnv: function(opts) {
-            return check_reqs.check_ant()
-            .then(function() {
-                // Copy in build.xml on each build so that:
-                // A) we don't require the Android SDK at project creation time, and
-                // B) we always use the SDK's latest version of it.
-                var sdkDir = process.env['ANDROID_HOME'];
-                var buildTemplate = fs.readFileSync(path.join(sdkDir, 'tools', 'lib', 'build.template'), 'utf8');
-                function writeBuildXml(projectPath) {
-                    var newData = buildTemplate.replace('PROJECT_NAME', extractProjectNameFromManifest(ROOT));
-                    fs.writeFileSync(path.join(projectPath, 'build.xml'), newData);
-                    if (!fs.existsSync(path.join(projectPath, 'local.properties'))) {
-                        fs.writeFileSync(path.join(projectPath, 'local.properties'), TEMPLATE);
-                    }
-                }
-                writeBuildXml(ROOT);
-                var propertiesObj = readProjectProperties();
-                var subProjects = propertiesObj.libs;
-                for (var i = 0; i < subProjects.length; ++i) {
-                    writeBuildXml(path.join(ROOT, subProjects[i]));
-                }
-                if (propertiesObj.systemLibs.length > 0) {
-                    throw new Error('Project contains at least one plugin that requires a system library. This is not supported with ANT. Please build using gradle.');
-                }
-
-                var propertiesFile = opts.buildType + SIGNING_PROPERTIES;
-                var propertiesFilePath = path.join(ROOT, propertiesFile);
-                if (opts.packageInfo) {
-                    fs.writeFileSync(propertiesFilePath, TEMPLATE + opts.packageInfo.toProperties());
-                } else if(isAutoGenerated(propertiesFilePath)) {
-                    shell.rm('-f', propertiesFilePath);
-                }
-            });
-        },
-
-        /*
-         * Builds the project with ant.
-         * Returns a promise.
-         */
-        build: function(opts) {
-            // Without our custom_rules.xml, we need to clean before building.
-            var ret = Q();
-            if (!hasCustomRules()) {
-                // clean will call check_ant() for us.
-                ret = this.clean(opts);
-            }
-
-            var args = this.getArgs(opts.buildType == 'debug' ? 'debug' : 'release', opts);
-            return check_reqs.check_ant()
-            .then(function() {
-                console.log('Executing: ant ' + args.join(' '));
-                return spawn('ant', args);
-            });
-        },
-
-        clean: function(opts) {
-            var args = this.getArgs('clean', opts);
-            return check_reqs.check_ant()
-            .then(function() {
-                return spawn('ant', args);
-            });
-        },
-
-        findOutputApks: function(build_type) {
-            var binDir = path.join(ROOT, hasCustomRules() ? 'ant-build' : 'bin');
-            return findOutputApksHelper(binDir, build_type, null);
-        }
-    },
-    gradle: {
-        getArgs: function(cmd, opts) {
-            if (cmd == 'release') {
-                cmd = 'cdvBuildRelease';
-            } else if (cmd == 'debug') {
-                cmd = 'cdvBuildDebug';
-            }
-            var args = [cmd, '-b', path.join(ROOT, 'build.gradle')];
-            if (opts.arch) {
-                args.push('-PcdvBuildArch=' + opts.arch);
-            }
-
-            // 10 seconds -> 6 seconds
-            args.push('-Dorg.gradle.daemon=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');
-            return args;
-        },
-
-        // Makes the project buildable, minus the gradle wrapper.
-        prepBuildFiles: function() {
-            var projectPath = ROOT;
-            // Update the version of build.gradle in each dependent library.
-            var pluginBuildGradle = path.join(projectPath, 'cordova', 'lib', 'plugin-build.gradle');
-            var propertiesObj = readProjectProperties();
-            var subProjects = propertiesObj.libs;
-            for (var i = 0; i < subProjects.length; ++i) {
-                if (subProjects[i] !== 'CordovaLib') {
-                    shell.cp('-f', pluginBuildGradle, path.join(ROOT, subProjects[i], 'build.gradle'));
-                }
-            }
-
-            var name = extractRealProjectNameFromManifest(ROOT);
-            //Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149
-            var settingsGradlePaths =  subProjects.map(function(p){
-                var realDir=p.replace(/[/\\]/g, ':');
-                var libName=realDir.replace(name+'-','');
-                var str='include ":'+libName+'"\n';
-                if(realDir.indexOf(name+'-')!==-1)
-                    str+='project(":'+libName+'").projectDir = new File("'+p+'")\n';
-                return str;
-            });
-
-            // Write the settings.gradle file.
-            fs.writeFileSync(path.join(projectPath, 'settings.gradle'),
-                '// GENERATED FILE - DO NOT EDIT\n' +
-                'include ":"\n' + settingsGradlePaths.join(''));
-            // Update dependencies within build.gradle.
-            var buildGradle = fs.readFileSync(path.join(projectPath, 'build.gradle'), 'utf8');
-            var depsList = '';
-            subProjects.forEach(function(p) {
-                var libName=p.replace(/[/\\]/g, ':').replace(name+'-','');
-                depsList += '    debugCompile project(path: "' + libName + '", configuration: "debug")\n';
-                depsList += '    releaseCompile project(path: "' + libName + '", configuration: "release")\n';
-            });
-            // For why we do this mapping: https://issues.apache.org/jira/browse/CB-8390
-            var SYSTEM_LIBRARY_MAPPINGS = [
-                [/^\/?extras\/android\/support\/(.*)$/, 'com.android.support:support-$1:+'],
-                [/^\/?google\/google_play_services\/libproject\/google-play-services_lib\/?$/, 'com.google.android.gms:play-services:+']
-            ];
-            propertiesObj.systemLibs.forEach(function(p) {
-                var mavenRef;
-                // It's already in gradle form if it has two ':'s
-                if (/:.*:/.exec(p)) {
-                    mavenRef = p;
-                } else {
-                    for (var i = 0; i < SYSTEM_LIBRARY_MAPPINGS.length; ++i) {
-                        var pair = SYSTEM_LIBRARY_MAPPINGS[i];
-                        if (pair[0].exec(p)) {
-                            mavenRef = p.replace(pair[0], pair[1]);
-                            break;
-                        }
-                    }
-                    if (!mavenRef) {
-                        throw new Error('Unsupported system library (does not work with gradle): ' + p);
-                    }
-                }
-                depsList += '    compile "' + mavenRef + '"\n';
-            });
-            buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + depsList + '    $2');
-            var includeList = '';
-            propertiesObj.gradleIncludes.forEach(function(includePath) {
-                includeList += 'apply from: "' + includePath + '"\n';
-            });
-            buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + includeList + '$2');
-            fs.writeFileSync(path.join(projectPath, 'build.gradle'), buildGradle);
-        },
-
-        prepEnv: function(opts) {
-            var self = this;
-            return check_reqs.check_gradle()
-            .then(function() {
-                return self.prepBuildFiles();
-            }).then(function() {
-                // Copy the gradle wrapper on each build so that:
-                // A) we don't require the Android SDK at project creation time, and
-                // B) we always use the SDK's latest version of it.
-                var projectPath = ROOT;
-                // check_reqs ensures that this is set.
-                var sdkDir = process.env['ANDROID_HOME'];
-                var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
-                if (process.platform == 'win32') {
-                    shell.rm('-f', path.join(projectPath, 'gradlew.bat'));
-                    shell.cp(path.join(wrapperDir, 'gradlew.bat'), projectPath);
-                } else {
-                    shell.rm('-f', path.join(projectPath, 'gradlew'));
-                    shell.cp(path.join(wrapperDir, 'gradlew'), projectPath);
-                }
-                shell.rm('-rf', path.join(projectPath, 'gradle', 'wrapper'));
-                shell.mkdir('-p', path.join(projectPath, 'gradle'));
-                shell.cp('-r', path.join(wrapperDir, 'gradle', 'wrapper'), path.join(projectPath, 'gradle'));
-
-                // If the gradle distribution URL is set, make sure it points to version we want.
-                // If it's not set, do nothing, assuming that we're using a future version of gradle that we don't want to mess with.
-                // For some reason, using ^ and $ don't work.  This does the job, though.
-                var distributionUrlRegex = /distributionUrl.*zip/;
-                var distributionUrl = 'distributionUrl=http\\://services.gradle.org/distributions/gradle-2.2.1-all.zip';
-                var gradleWrapperPropertiesPath = path.join(projectPath, 'gradle', 'wrapper', 'gradle-wrapper.properties');
-                shell.chmod('u+w', gradleWrapperPropertiesPath);
-                shell.sed('-i', distributionUrlRegex, distributionUrl, gradleWrapperPropertiesPath);
-
-                var propertiesFile = opts.buildType + SIGNING_PROPERTIES;
-                var propertiesFilePath = path.join(ROOT, propertiesFile);
-                if (opts.packageInfo) {
-                    fs.writeFileSync(propertiesFilePath, TEMPLATE + opts.packageInfo.toProperties());
-                } else if (isAutoGenerated(propertiesFilePath)) {
-                    shell.rm('-f', propertiesFilePath);
-                }
-            });
-        },
-
-        /*
-         * Builds the project with gradle.
-         * Returns a promise.
-         */
-        build: function(opts) {
-            var wrapper = path.join(ROOT, 'gradlew');
-            var args = this.getArgs(opts.buildType == 'debug' ? 'debug' : 'release', opts);
-            return Q().then(function() {
-                console.log('Running: ' + wrapper + ' ' + args.join(' '));
-                return spawn(wrapper, args);
-            });
-        },
-
-        clean: function(opts) {
-            var builder = this;
-            var wrapper = path.join(ROOT, 'gradlew');
-            var args = builder.getArgs('clean', opts);
-            return Q().then(function() {
-                console.log('Running: ' + wrapper + ' ' + args.join(' '));
-                return spawn(wrapper, args);
-            });
-        },
-
-        findOutputApks: function(build_type, arch) {
-            var binDir = path.join(ROOT, 'build', 'outputs', 'apk');
-            return findOutputApksHelper(binDir, build_type, arch);
-        }
-    },
-
-    none: {
-        prepEnv: function() {
-            return Q();
-        },
-        build: function() {
-            console.log('Skipping build...');
-            return Q(null);
-        },
-        clean: function() {
-            return Q();
-        },
-        findOutputApks: function(build_type, arch) {
-            return sortFilesByDate(builders.ant.findOutputApks(build_type, arch).concat(builders.gradle.findOutputApks(build_type, arch)));
-        }
-    }
-};
-
-module.exports.isBuildFlag = function(flag) {
-    return /^--(debug|release|ant|gradle|nobuild|versionCode=|minSdkVersion=|gradleArg=|keystore=|alias=|password=|storePassword=|keystoreType=|buildConfig=)/.exec(flag);
-};
-
-function parseOpts(options, resolvedTarget) {
-    // Backwards-compatibility: Allow a single string argument
-    if (typeof options == 'string') options = [options];
+function parseOpts(options, resolvedTarget, projectRoot) {
+    options = options || {};
+    options.argv = nopt({
+        gradle: Boolean,
+        ant: Boolean,
+        prepenv: Boolean,
+        versionCode: String,
+        minSdkVersion: String,
+        gradleArg: [String, Array],
+        keystore: path,
+        alias: String,
+        storePassword: String,
+        password: String,
+        keystoreType: String
+    }, {}, options.argv, 0);

    var ret = {
-        buildType: 'debug',
-        buildMethod: process.env['ANDROID_BUILD'] || 'gradle',
-        arch: null,
+        buildType: options.release ? 'release' : 'debug',
+        buildMethod: process.env.ANDROID_BUILD || 'gradle',
+        prepEnv: options.argv.prepenv,
+        arch: resolvedTarget && resolvedTarget.arch,
        extraArgs: []
    };

-    var multiValueArgs = {
-      'versionCode': true,
-      'minSdkVersion': true,
-      'gradleArg': true,
-      'keystore' : true,
-      'alias' : true,
-      'password' : true,
-      'storePassword' : true,
-      'keystoreType' : true,
-      'buildConfig' : true
-    };
-    var packageArgs = {};
-    var buildConfig;
-    // Iterate through command line options
-    for (var i=0; options && (i < options.length); ++i) {
-        if (/^--/.exec(options[i])) {
-            var keyValue = options[i].substring(2).split('=');
-            var flagName = keyValue.shift();
-            var flagValue = keyValue.join('=');
-            if (multiValueArgs[flagName] && !flagValue) {
-                flagValue = options[i + 1];
-                ++i;
-            }
-            switch(flagName) {
-                case 'debug':
-                case 'release':
-                    ret.buildType = flagName;
-                    break;
-                case 'ant':
-                case 'gradle':
-                    ret.buildMethod = flagName;
-                    break;
-                case 'device':
-                case 'emulator':
-                    // Don't need to do anything special to when building for device vs emulator.
-                    // iOS uses this flag to switch on architecture.
-                    break;
-                case 'prepenv' :
-                    ret.prepEnv = true;
-                    break;
-                case 'nobuild' :
-                    ret.buildMethod = 'none';
-                    break;
-                case 'versionCode':
-                    ret.extraArgs.push('-PcdvVersionCode=' + flagValue);
-                    break;
-                case 'minSdkVersion':
-                    ret.extraArgs.push('-PcdvMinSdkVersion=' + flagValue);
-                    break;
-                case 'gradleArg':
-                    ret.extraArgs.push(flagValue);
-                    break;
-                case 'keystore':
-                    packageArgs.keystore = path.relative(ROOT, path.resolve(flagValue));
-                    break;
-                case 'alias':
-                case 'storePassword':
-                case 'password':
-                case 'keystoreType':
-                    packageArgs[flagName] = flagValue;
-                    break;
-                case 'buildConfig':
-                    buildConfig = flagValue;
-                    break;
-                default :
-                    console.warn('Build option --\'' + flagName + '\' not recognized (ignoring).');
-            }
-        } else {
-            console.warn('Build option \'' + options[i] + '\' not recognized (ignoring).');
-        }
+    if (options.argv.ant || options.argv.gradle)
+        ret.buildMethod = options.argv.ant ? 'ant' : 'gradle';
+
+    if (options.nobuild) ret.buildMethod = 'none';
+
+    if (options.argv.versionCode)
+        ret.extraArgs.push('-PcdvVersionCode=' + options.argv.versionCode);
+
+    if (options.argv.minSdkVersion)
+        ret.extraArgs.push('-PcdvMinSdkVersion=' + options.argv.minSdkVersion);
+
+    if (options.argv.gradleArg) {
+        ret.extraArgs = ret.extraArgs.concat(options.argv.gradleArg);
    }

+    var packageArgs = {};
+
+    if (options.argv.keystore)
+        packageArgs.keystore = path.relative(projectRoot, path.resolve(options.argv.keystore));
+
+    ['alias','storePassword','password','keystoreType'].forEach(function (flagName) {
+        if (options.argv[flagName])
+            packageArgs[flagName] = options.argv[flagName];
+    });
+
+    var buildConfig = options.buildConfig;
+
    // If some values are not specified as command line arguments - use build config to supplement them.
    // Command line arguemnts have precedence over build config.
    if (buildConfig) {
        if (!fs.existsSync(buildConfig)) {
            throw new Error('Specified build config file does not exist: ' + buildConfig);
        }
-        console.log('Reading build config file: '+ path.resolve(buildConfig));
-        var config = JSON.parse(fs.readFileSync(buildConfig, 'utf8'));
+        events.emit('log', 'Reading build config file: '+ path.resolve(buildConfig));
+        var buildjson = fs.readFileSync(buildConfig, 'utf8');
+        var config = JSON.parse(buildjson.replace(/^\ufeff/, '')); // Remove BOM
        if (config.android && config.android[ret.buildType]) {
            var androidInfo = config.android[ret.buildType];
            if(androidInfo.keystore && !packageArgs.keystore) {
-                if(path.isAbsolute(androidInfo.keystore)) {
-                    packageArgs.keystore = androidInfo.keystore;
-                } else {
-                    packageArgs.keystore = path.relative(ROOT, path.join(path.dirname(buildConfig), androidInfo.keystore));
+                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);
            }

            ['alias', 'storePassword', 'password','keystoreType'].forEach(function (key){
@@ -513,6 +106,7 @@ function parseOpts(options, resolvedTarget) {
            });
        }
    }
+
    if (packageArgs.keystore && packageArgs.alias) {
        ret.packageInfo = new PackageInfo(packageArgs.keystore, packageArgs.alias, packageArgs.storePassword,
            packageArgs.password, packageArgs.keystoreType);
@@ -520,10 +114,9 @@ function parseOpts(options, resolvedTarget) {

    if(!ret.packageInfo) {
        if(Object.keys(packageArgs).length > 0) {
-            console.warn('\'keystore\' and \'alias\' need to be specified to generate a signed archive.');
+            events.emit('warn', '\'keystore\' and \'alias\' need to be specified to generate a signed archive.');
        }
    }
-    ret.arch = resolvedTarget && resolvedTarget.arch;

    return ret;
 }
@@ -533,41 +126,39 @@ function parseOpts(options, resolvedTarget) {
 * Returns a promise.
 */
 module.exports.runClean = function(options) {
-    var opts = parseOpts(options);
-    var builder = builders[opts.buildMethod];
+    var opts = parseOpts(options, null, this.root);
+    var builder = builders.getBuilder(opts.buildMethod);
    return builder.prepEnv(opts)
    .then(function() {
        return builder.clean(opts);
-    }).then(function() {
-        shell.rm('-rf', path.join(ROOT, 'out'));
-
-        ['debug', 'release'].forEach(function(config) {
-            var propertiesFilePath = path.join(ROOT, config + SIGNING_PROPERTIES);
-            if(isAutoGenerated(propertiesFilePath)){
-                shell.rm('-f', propertiesFilePath);
-            }
-        });
    });
 };

-/*
- * Builds the project with the specifed options
- * Returns a promise.
+/**
+ * Builds the project with the specifed options.
+ *
+ * @param   {BuildOptions}  options      A set of options. See PlatformApi.build
+ *   method documentation for reference.
+ * @param   {Object}  optResolvedTarget  A deployment target. Used to pass
+ *   target architecture from upstream 'run' call. TODO: remove this option in
+ *   favor of setting buildOptions.archs field.
+ *
+ * @return  {Promise<Object>}            Promise, resolved with built packages
+ *   information.
 */
 module.exports.run = function(options, optResolvedTarget) {
-    var opts = parseOpts(options, optResolvedTarget);
-    var builder = builders[opts.buildMethod];
+    var opts = parseOpts(options, optResolvedTarget, this.root);
+    var builder = builders.getBuilder(opts.buildMethod);
    return builder.prepEnv(opts)
    .then(function() {
        if (opts.prepEnv) {
-            console.log('Build file successfully prepared.');
+            events.emit('verbose', 'Build file successfully prepared.');
            return;
        }
        return builder.build(opts)
        .then(function() {
            var apkPaths = builder.findOutputApks(opts.buildType, opts.arch);
-            console.log('Built the following apk(s):');
-            console.log('    ' + apkPaths.join('\n    '));
+            events.emit('log', 'Built the following apk(s): \n\t' + apkPaths.join('\n\t'));
            return {
                apkPaths: apkPaths,
                buildType: opts.buildType,
@@ -577,46 +168,38 @@ module.exports.run = function(options, optResolvedTarget) {
    });
 };

-// Called by plugman after installing plugins, and by create script after creating project.
-module.exports.prepBuildFiles = function() {
-    var builder = builders['gradle'];
-    return builder.prepBuildFiles();
-};
-
 /*
 * Detects the architecture of a device/emulator
 * Returns "arm" or "x86".
 */
 module.exports.detectArchitecture = function(target) {
    function helper() {
-        return exec('adb -s ' + target + ' shell cat /proc/cpuinfo', os.tmpdir())
+        return Adb.shell(target, 'cat /proc/cpuinfo')
        .then(function(output) {
-            if (/intel/i.exec(output)) {
-                return 'x86';
-            }
-            return 'arm';
+            return /intel/i.exec(output) ? 'x86' : 'arm';
        });
    }
    // It sometimes happens (at least on OS X), that this command will hang forever.
    // To fix it, either unplug & replug device, or restart adb server.
-    return helper().timeout(1000, 'Device communication timed out. Try unplugging & replugging the device.')
+    return helper()
+    .timeout(1000, new CordovaError('Device communication timed out. Try unplugging & replugging the device.'))
    .then(null, function(err) {
        if (/timed out/.exec('' + err)) {
            // adb kill-server doesn't seem to do the trick.
            // Could probably find a x-platform version of killall, but I'm not actually
            // sure that this scenario even happens on non-OSX machines.
-            return exec('killall adb')
+            events.emit('verbose', 'adb timed out while detecting device/emulator architecture. Killing adb and trying again.');
+            return spawn('killall', ['adb'])
            .then(function() {
-                console.log('adb seems hung. retrying.');
                return helper()
                .then(null, function() {
                    // The double kill is sadly often necessary, at least on mac.
-                    console.log('Now device not found... restarting adb again.');
-                    return exec('killall adb')
+                    events.emit('warn', 'adb timed out a second time while detecting device/emulator architecture. Killing adb and trying again.');
+                    return spawn('killall', ['adb'])
                    .then(function() {
                        return helper()
                        .then(null, function() {
-                            return Q.reject('USB is flakey. Try unplugging & replugging the device.');
+                            return Q.reject(new CordovaError('adb timed out a third time while detecting device/emulator architecture. Try unplugging & replugging the device.'));
                        });
                    });
                });
@@ -631,16 +214,18 @@ module.exports.detectArchitecture = function(target) {

 module.exports.findBestApkForArchitecture = function(buildResults, arch) {
    var paths = buildResults.apkPaths.filter(function(p) {
+        var apkName = path.basename(p);
        if (buildResults.buildType == 'debug') {
-            return /-debug/.exec(p);
+            return /-debug/.exec(apkName);
        }
-        return !/-debug/.exec(p);
+        return !/-debug/.exec(apkName);
    });
    var archPattern = new RegExp('-' + arch);
    var hasArchPattern = /-x86|-arm/;
    for (var i = 0; i < paths.length; ++i) {
-        if (hasArchPattern.exec(paths[i])) {
-            if (archPattern.exec(paths[i])) {
+        var apkName = path.basename(paths[i]);
+        if (hasArchPattern.exec(apkName)) {
+            if (archPattern.exec(apkName)) {
                return paths[i];
            }
        } else {
@@ -694,7 +279,7 @@ PackageInfo.prototype = {
 };

 module.exports.help = function() {
-    console.log('Usage: ' + path.relative(process.cwd(), path.join(ROOT, 'cordova', 'build')) + ' [flags] [Signed APK flags]');
+    console.log('Usage: ' + path.relative(process.cwd(), path.join('../build')) + ' [flags] [Signed APK flags]');
    console.log('Flags:');
    console.log('    \'--debug\': will build project in debug mode (default)');
    console.log('    \'--release\': will build project for release');
--- a/bin/templates/cordova/lib/builders/AntBuilder.js
+++ b/bin/templates/cordova/lib/builders/AntBuilder.js
@@ -0,0 +1,156 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+var Q = require('q');
+var fs = require('fs');
+var path = require('path');
+var util = require('util');
+var shell = require('shelljs');
+var spawn = require('cordova-common').superspawn.spawn;
+var CordovaError = require('cordova-common').CordovaError;
+var check_reqs = require('../check_reqs');
+
+var SIGNING_PROPERTIES = '-signing.properties';
+var MARKER = 'YOUR CHANGES WILL BE ERASED!';
+var TEMPLATE =
+    '# This file is automatically generated.\n' +
+    '# Do not modify this file -- ' + MARKER + '\n';
+
+var GenericBuilder = require('./GenericBuilder');
+
+function AntBuilder (projectRoot) {
+    GenericBuilder.call(this, projectRoot);
+
+    this.binDirs = {ant: this.binDirs.ant};
+}
+
+util.inherits(AntBuilder, GenericBuilder);
+
+AntBuilder.prototype.getArgs = function(cmd, opts) {
+    var args = [cmd, '-f', path.join(this.root, 'build.xml')];
+    // custom_rules.xml is required for incremental builds.
+    if (hasCustomRules(this.root)) {
+        args.push('-Dout.dir=ant-build', '-Dgen.absolute.dir=ant-gen');
+    }
+    if(opts.packageInfo) {
+        args.push('-propertyfile=' + path.join(this.root, opts.buildType + SIGNING_PROPERTIES));
+    }
+    return args;
+};
+
+AntBuilder.prototype.prepEnv = function(opts) {
+    var self = this;
+    return check_reqs.check_ant()
+    .then(function() {
+        // Copy in build.xml on each build so that:
+        // A) we don't require the Android SDK at project creation time, and
+        // B) we always use the SDK's latest version of it.
+        /*jshint -W069 */
+        var sdkDir = process.env['ANDROID_HOME'];
+        /*jshint +W069 */
+        var buildTemplate = fs.readFileSync(path.join(sdkDir, 'tools', 'lib', 'build.template'), 'utf8');
+        function writeBuildXml(projectPath) {
+            var newData = buildTemplate.replace('PROJECT_NAME', self.extractRealProjectNameFromManifest());
+            fs.writeFileSync(path.join(projectPath, 'build.xml'), newData);
+            if (!fs.existsSync(path.join(projectPath, 'local.properties'))) {
+                fs.writeFileSync(path.join(projectPath, 'local.properties'), TEMPLATE);
+            }
+        }
+        writeBuildXml(self.root);
+        var propertiesObj = self.readProjectProperties();
+        var subProjects = propertiesObj.libs;
+        for (var i = 0; i < subProjects.length; ++i) {
+            writeBuildXml(path.join(self.root, subProjects[i]));
+        }
+        if (propertiesObj.systemLibs.length > 0) {
+            throw new CordovaError('Project contains at least one plugin that requires a system library. This is not supported with ANT. Use gradle instead.');
+        }
+
+        var propertiesFile = opts.buildType + SIGNING_PROPERTIES;
+        var propertiesFilePath = path.join(self.root, propertiesFile);
+        if (opts.packageInfo) {
+            fs.writeFileSync(propertiesFilePath, TEMPLATE + opts.packageInfo.toProperties());
+        } else if(isAutoGenerated(propertiesFilePath)) {
+            shell.rm('-f', propertiesFilePath);
+        }
+    });
+};
+
+/*
+ * Builds the project with ant.
+ * Returns a promise.
+ */
+AntBuilder.prototype.build = function(opts) {
+    // Without our custom_rules.xml, we need to clean before building.
+    var ret = Q();
+    if (!hasCustomRules(this.root)) {
+        // clean will call check_ant() for us.
+        ret = this.clean(opts);
+    }
+
+    var args = this.getArgs(opts.buildType == 'debug' ? 'debug' : 'release', opts);
+    return check_reqs.check_ant()
+    .then(function() {
+        return spawn('ant', args, {stdio: 'pipe'});
+    }).progress(function (stdio){
+        if (stdio.stderr) {
+            process.stderr.write(stdio.stderr);
+        } else {
+            process.stdout.write(stdio.stdout);
+        }
+    }).catch(function (error) {
+        if (error.toString().indexOf('Unable to resolve project target') >= 0) {
+            return check_reqs.check_android_target(error).then(function() {
+                // If due to some odd reason - check_android_target succeeds
+                // we should still fail here.
+                return Q.reject(error);
+            });
+        }
+        return Q.reject(error);
+    });
+};
+
+AntBuilder.prototype.clean = function(opts) {
+    var args = this.getArgs('clean', opts);
+    var self = this;
+    return check_reqs.check_ant()
+    .then(function() {
+        return spawn('ant', args, {stdio: 'inherit'});
+    })
+    .then(function () {
+        shell.rm('-rf', path.join(self.root, 'out'));
+
+        ['debug', 'release'].forEach(function(config) {
+            var propertiesFilePath = path.join(self.root, config + SIGNING_PROPERTIES);
+            if(isAutoGenerated(propertiesFilePath)){
+                shell.rm('-f', propertiesFilePath);
+            }
+        });
+    });
+};
+
+module.exports = AntBuilder;
+
+function hasCustomRules(projectRoot) {
+    return fs.existsSync(path.join(projectRoot, 'custom_rules.xml'));
+}
+
+function isAutoGenerated(file) {
+    return fs.existsSync(file) && fs.readFileSync(file, 'utf8').indexOf(MARKER) > 0;
+}
--- a/bin/templates/cordova/lib/builders/GenericBuilder.js
+++ b/bin/templates/cordova/lib/builders/GenericBuilder.js
@@ -0,0 +1,147 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+var Q = require('q');
+var fs = require('fs');
+var path = require('path');
+var shell = require('shelljs');
+var events = require('cordova-common').events;
+var CordovaError = require('cordova-common').CordovaError;
+
+function GenericBuilder (projectDir) {
+    this.root = projectDir || path.resolve(__dirname, '../../..');
+    this.binDirs = {
+        ant: path.join(this.root, hasCustomRules(this.root) ? 'ant-build' : 'bin'),
+        gradle: path.join(this.root, 'build', 'outputs', 'apk')
+    };
+}
+
+function hasCustomRules(projectRoot) {
+    return fs.existsSync(path.join(projectRoot, 'custom_rules.xml'));
+}
+
+GenericBuilder.prototype.prepEnv = function() {
+    return Q();
+};
+
+GenericBuilder.prototype.build = function() {
+    events.emit('log', 'Skipping build...');
+    return Q(null);
+};
+
+GenericBuilder.prototype.clean = function() {
+    return Q();
+};
+
+GenericBuilder.prototype.findOutputApks = function(build_type, arch) {
+    var self = this;
+    return Object.keys(this.binDirs)
+    .reduce(function (result, builderName) {
+        var binDir = self.binDirs[builderName];
+        return result.concat(findOutputApksHelper(binDir, build_type, builderName === 'ant' ? null : arch));
+    }, [])
+    .sort(apkSorter);
+};
+
+GenericBuilder.prototype.readProjectProperties = function () {
+    function findAllUniq(data, r) {
+        var s = {};
+        var m;
+        while ((m = r.exec(data))) {
+            s[m[1]] = 1;
+        }
+        return Object.keys(s);
+    }
+
+    var data = fs.readFileSync(path.join(this.root, 'project.properties'), 'utf8');
+    return {
+        libs: findAllUniq(data, /^\s*android\.library\.reference\.\d+=(.*)(?:\s|$)/mg),
+        gradleIncludes: findAllUniq(data, /^\s*cordova\.gradle\.include\.\d+=(.*)(?:\s|$)/mg),
+        systemLibs: findAllUniq(data, /^\s*cordova\.system\.library\.\d+=(.*)(?:\s|$)/mg)
+    };
+};
+
+GenericBuilder.prototype.extractRealProjectNameFromManifest = function () {
+    var manifestPath = path.join(this.root, 'AndroidManifest.xml');
+    var manifestData = fs.readFileSync(manifestPath, 'utf8');
+    var m = /<manifest[\s\S]*?package\s*=\s*"(.*?)"/i.exec(manifestData);
+    if (!m) {
+        throw new CordovaError('Could not find package name in ' + manifestPath);
+    }
+
+    var packageName=m[1];
+    var lastDotIndex = packageName.lastIndexOf('.');
+    return packageName.substring(lastDotIndex + 1);
+};
+
+module.exports = GenericBuilder;
+
+function apkSorter(fileA, fileB) {
+    // De-prioritize unsigned builds
+    var unsignedRE = /-unsigned/;
+    if (unsignedRE.exec(fileA)) {
+        return 1;
+    } else if (unsignedRE.exec(fileB)) {
+        return -1;
+    }
+
+    var timeDiff = fs.statSync(fileA).mtime - fs.statSync(fileB).mtime;
+    return timeDiff === 0 ? fileA.length - fileB.length : timeDiff;
+}
+
+function findOutputApksHelper(dir, build_type, arch) {
+    var shellSilent = shell.config.silent;
+    shell.config.silent = true;
+
+    var ret = shell.ls(path.join(dir, '*.apk'))
+    .filter(function(candidate) {
+        var apkName = path.basename(candidate);
+        // Need to choose between release and debug .apk.
+        if (build_type === 'debug') {
+            return /-debug/.exec(apkName) && !/-unaligned|-unsigned/.exec(apkName);
+        }
+        if (build_type === 'release') {
+            return /-release/.exec(apkName) && !/-unaligned/.exec(apkName);
+        }
+        return true;
+    })
+    .sort(apkSorter);
+
+    shellSilent = shellSilent;
+
+    if (ret.length === 0) {
+        return ret;
+    }
+    // Assume arch-specific build if newest apk has -x86 or -arm.
+    var archSpecific = !!/-x86|-arm/.exec(path.basename(ret[0]));
+    // And show only arch-specific ones (or non-arch-specific)
+    ret = ret.filter(function(p) {
+        /*jshint -W018 */
+        return !!/-x86|-arm/.exec(path.basename(p)) == archSpecific;
+        /*jshint +W018 */
+    });
+
+    if (archSpecific && ret.length > 1 && arch) {
+        ret = ret.filter(function(p) {
+            return path.basename(p).indexOf('-' + arch) != -1;
+        });
+    }
+
+    return ret;
+}
--- a/bin/templates/cordova/lib/builders/GradleBuilder.js
+++ b/bin/templates/cordova/lib/builders/GradleBuilder.js
@@ -0,0 +1,241 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+var Q = require('q');
+var fs = require('fs');
+var util = require('util');
+var path = require('path');
+var shell = require('shelljs');
+var spawn = require('cordova-common').superspawn.spawn;
+var CordovaError = require('cordova-common').CordovaError;
+var check_reqs = require('../check_reqs');
+
+var GenericBuilder = require('./GenericBuilder');
+
+var MARKER = 'YOUR CHANGES WILL BE ERASED!';
+var SIGNING_PROPERTIES = '-signing.properties';
+var TEMPLATE =
+    '# This file is automatically generated.\n' +
+    '# Do not modify this file -- ' + MARKER + '\n';
+
+function GradleBuilder (projectRoot) {
+    GenericBuilder.call(this, projectRoot);
+
+    this.binDirs = {gradle: this.binDirs.gradle};
+}
+
+util.inherits(GradleBuilder, GenericBuilder);
+
+GradleBuilder.prototype.getArgs = function(cmd, opts) {
+    if (cmd == 'release') {
+        cmd = 'cdvBuildRelease';
+    } else if (cmd == 'debug') {
+        cmd = 'cdvBuildDebug';
+    }
+    var args = [cmd, '-b', path.join(this.root, 'build.gradle')];
+    if (opts.arch) {
+        args.push('-PcdvBuildArch=' + opts.arch);
+    }
+
+    // 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');
+    return args;
+};
+
+// Makes the project buildable, minus the gradle wrapper.
+GradleBuilder.prototype.prepBuildFiles = function() {
+    // Update the version of build.gradle in each dependent library.
+    var pluginBuildGradle = path.join(this.root, 'cordova', 'lib', 'plugin-build.gradle');
+    var propertiesObj = this.readProjectProperties();
+    var subProjects = propertiesObj.libs;
+    for (var i = 0; i < subProjects.length; ++i) {
+        if (subProjects[i] !== 'CordovaLib') {
+            shell.cp('-f', pluginBuildGradle, path.join(this.root, subProjects[i], 'build.gradle'));
+        }
+    }
+
+    var name = this.extractRealProjectNameFromManifest();
+    //Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149
+    var settingsGradlePaths =  subProjects.map(function(p){
+        var realDir=p.replace(/[/\\]/g, ':');
+        var libName=realDir.replace(name+'-','');
+        var str='include ":'+libName+'"\n';
+        if(realDir.indexOf(name+'-')!==-1)
+            str+='project(":'+libName+'").projectDir = new File("'+p+'")\n';
+        return str;
+    });
+
+    // Write the settings.gradle file.
+    fs.writeFileSync(path.join(this.root, 'settings.gradle'),
+        '// GENERATED FILE - DO NOT EDIT\n' +
+        'include ":"\n' + settingsGradlePaths.join(''));
+    // Update dependencies within build.gradle.
+    var buildGradle = fs.readFileSync(path.join(this.root, 'build.gradle'), 'utf8');
+    var depsList = '';
+    subProjects.forEach(function(p) {
+        var libName=p.replace(/[/\\]/g, ':').replace(name+'-','');
+        depsList += '    debugCompile project(path: "' + libName + '", configuration: "debug")\n';
+        depsList += '    releaseCompile project(path: "' + libName + '", configuration: "release")\n';
+    });
+    // For why we do this mapping: https://issues.apache.org/jira/browse/CB-8390
+    var SYSTEM_LIBRARY_MAPPINGS = [
+        [/^\/?extras\/android\/support\/(.*)$/, 'com.android.support:support-$1:+'],
+        [/^\/?google\/google_play_services\/libproject\/google-play-services_lib\/?$/, 'com.google.android.gms:play-services:+']
+    ];
+    propertiesObj.systemLibs.forEach(function(p) {
+        var mavenRef;
+        // It's already in gradle form if it has two ':'s
+        if (/:.*:/.exec(p)) {
+            mavenRef = p;
+        } else {
+            for (var i = 0; i < SYSTEM_LIBRARY_MAPPINGS.length; ++i) {
+                var pair = SYSTEM_LIBRARY_MAPPINGS[i];
+                if (pair[0].exec(p)) {
+                    mavenRef = p.replace(pair[0], pair[1]);
+                    break;
+                }
+            }
+            if (!mavenRef) {
+                throw new CordovaError('Unsupported system library (does not work with gradle): ' + p);
+            }
+        }
+        depsList += '    compile "' + mavenRef + '"\n';
+    });
+    buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + depsList + '    $2');
+    var includeList = '';
+    propertiesObj.gradleIncludes.forEach(function(includePath) {
+        includeList += 'apply from: "' + includePath + '"\n';
+    });
+    buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + includeList + '$2');
+    fs.writeFileSync(path.join(this.root, 'build.gradle'), buildGradle);
+};
+
+GradleBuilder.prototype.prepEnv = function(opts) {
+    var self = this;
+    return check_reqs.check_gradle()
+    .then(function() {
+        return self.prepBuildFiles();
+    }).then(function() {
+        // Copy the gradle wrapper on each build so that:
+        // A) we don't require the Android SDK at project creation time, and
+        // B) we always use the SDK's latest version of it.
+        // check_reqs ensures that this is set.
+        /*jshint -W069 */
+        var sdkDir = process.env['ANDROID_HOME'];
+        /*jshint +W069 */
+        var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
+        if (process.platform == 'win32') {
+            shell.rm('-f', path.join(self.root, 'gradlew.bat'));
+            shell.cp(path.join(wrapperDir, 'gradlew.bat'), self.root);
+        } else {
+            shell.rm('-f', path.join(self.root, 'gradlew'));
+            shell.cp(path.join(wrapperDir, 'gradlew'), self.root);
+        }
+        shell.rm('-rf', path.join(self.root, 'gradle', 'wrapper'));
+        shell.mkdir('-p', path.join(self.root, 'gradle'));
+        shell.cp('-r', path.join(wrapperDir, 'gradle', 'wrapper'), path.join(self.root, 'gradle'));
+
+        // If the gradle distribution URL is set, make sure it points to version we want.
+        // If it's not set, do nothing, assuming that we're using a future version of gradle that we don't want to mess with.
+        // For some reason, using ^ and $ don't work.  This does the job, though.
+        var distributionUrlRegex = /distributionUrl.*zip/;
+        /*jshint -W069 */
+        var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'http\\://services.gradle.org/distributions/gradle-2.13-all.zip';
+        /*jshint +W069 */
+        var gradleWrapperPropertiesPath = path.join(self.root, 'gradle', 'wrapper', 'gradle-wrapper.properties');
+        shell.chmod('u+w', gradleWrapperPropertiesPath);
+        shell.sed('-i', distributionUrlRegex, 'distributionUrl='+distributionUrl, gradleWrapperPropertiesPath);
+
+        var propertiesFile = opts.buildType + SIGNING_PROPERTIES;
+        var propertiesFilePath = path.join(self.root, propertiesFile);
+        if (opts.packageInfo) {
+            fs.writeFileSync(propertiesFilePath, TEMPLATE + opts.packageInfo.toProperties());
+        } else if (isAutoGenerated(propertiesFilePath)) {
+            shell.rm('-f', propertiesFilePath);
+        }
+    });
+};
+
+/*
+ * Builds the project with gradle.
+ * Returns a promise.
+ */
+GradleBuilder.prototype.build = function(opts) {
+    var wrapper = path.join(this.root, 'gradlew');
+    var args = this.getArgs(opts.buildType == 'debug' ? 'debug' : 'release', opts);
+
+    return spawn(wrapper, args, {stdio: 'pipe'})
+    .progress(function (stdio){
+        if (stdio.stderr) {
+            /*
+             * Workaround for the issue with Java printing some unwanted information to 
+             * stderr instead of stdout.
+             * This function suppresses 'Picked up _JAVA_OPTIONS' message from being
+             * printed to stderr. See https://issues.apache.org/jira/browse/CB-9971 for
+             * explanation.
+             */
+            var suppressThisLine = /^Picked up _JAVA_OPTIONS: /i.test(stdio.stderr.toString());
+            if (suppressThisLine) {
+                return;
+            }
+            process.stderr.write(stdio.stderr);
+        } else {
+            process.stdout.write(stdio.stdout);
+        }
+    }).catch(function (error) {
+        if (error.toString().indexOf('failed to find target with hash string') >= 0) {
+            return check_reqs.check_android_target(error).then(function() {
+                // If due to some odd reason - check_android_target succeeds
+                // we should still fail here.
+                return Q.reject(error);
+            });
+        }
+        return Q.reject(error);
+    });
+};
+
+GradleBuilder.prototype.clean = function(opts) {
+    var builder = this;
+    var wrapper = path.join(this.root, 'gradlew');
+    var args = builder.getArgs('clean', opts);
+    return Q().then(function() {
+        return spawn(wrapper, args, {stdio: 'inherit'});
+    })
+    .then(function () {
+        shell.rm('-rf', path.join(builder.root, 'out'));
+
+        ['debug', 'release'].forEach(function(config) {
+            var propertiesFilePath = path.join(builder.root, config + SIGNING_PROPERTIES);
+            if(isAutoGenerated(propertiesFilePath)){
+                shell.rm('-f', propertiesFilePath);
+            }
+        });
+    });
+};
+
+module.exports = GradleBuilder;
+
+function isAutoGenerated(file) {
+    return fs.existsSync(file) && fs.readFileSync(file, 'utf8').indexOf(MARKER) > 0;
+}
--- a/bin/templates/cordova/lib/builders/builders.js
+++ b/bin/templates/cordova/lib/builders/builders.js
@@ -0,0 +1,47 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+var CordovaError = require('cordova-common').CordovaError;
+
+var knownBuilders = {
+    ant: 'AntBuilder',
+    gradle: 'GradleBuilder',
+    none: 'GenericBuilder'
+};
+
+/**
+ * Helper method that instantiates and returns a builder for specified build
+ *   type.
+ *
+ * @param   {String}  builderType   Builder name to construct and return. Must
+ *   be one of 'ant', 'gradle' or 'none'
+ *
+ * @return  {Builder}               A builder instance for specified build type.
+ */
+module.exports.getBuilder = function (builderType, projectRoot) {
+    if (!knownBuilders[builderType])
+        throw new CordovaError('Builder ' + builderType + ' is not supported.');
+
+    try {
+        var Builder = require('./' + knownBuilders[builderType]);
+        return new Builder(projectRoot);
+    } catch (err) {
+        throw new CordovaError('Failed to instantiate ' + knownBuilders[builderType] + ' builder: ' + err);
+    }
+};
--- a/bin/templates/cordova/lib/device.js
+++ b/bin/templates/cordova/lib/device.js
@@ -19,40 +19,30 @@
       under the License.
 */

-var exec  = require('./exec'),
-    Q     = require('q'),
-    os    = require('os'),
-    build = require('./build'),
-    appinfo = require('./appinfo');
+var Q     = require('q'),
+    build = require('./build');
+var path = require('path');
+var Adb = require('./Adb');
+var AndroidManifest = require('./AndroidManifest');
+var spawn = require('cordova-common').superspawn.spawn;
+var CordovaError = require('cordova-common').CordovaError;
+var events = require('cordova-common').events;

 /**
 * Returns a promise for the list of the device ID's found
 * @param lookHarder When true, try restarting adb if no devices are found.
 */
 module.exports.list = function(lookHarder) {
-    function helper() {
-        return exec('adb devices', os.tmpdir())
-        .then(function(output) {
-            var response = output.split('\n');
-            var device_list = [];
-            for (var i = 1; i < response.length; i++) {
-                if (response[i].match(/\w+\tdevice/) && !response[i].match(/emulator/)) {
-                    device_list.push(response[i].replace(/\tdevice/, '').replace('\r', ''));
-                }
-            }
-            return device_list;
-        });
-    }
-    return helper()
+    return Adb.devices()
    .then(function(list) {
        if (list.length === 0 && lookHarder) {
            // adb kill-server doesn't seem to do the trick.
            // Could probably find a x-platform version of killall, but I'm not actually
            // sure that this scenario even happens on non-OSX machines.
-            return exec('killall adb')
+            return spawn('killall', ['adb'])
            .then(function() {
-                console.log('Restarting adb to see if more devices are detected.');
-                return helper();
+                events.emit('verbose', 'Restarting adb to see if more devices are detected.');
+                return Adb.devices();
            }, function() {
                // For non-killall OS's.
                return list;
@@ -66,7 +56,7 @@ module.exports.resolveTarget = function(target) {
    return this.list(true)
    .then(function(device_list) {
        if (!device_list || !device_list.length) {
-            return Q.reject('ERROR: Failed to deploy to device, no devices found.');
+            return Q.reject(new CordovaError('Failed to deploy to device, no devices found.'));
        }
        // default device
        target = target || device_list[0];
@@ -95,27 +85,36 @@ module.exports.install = function(target, buildResults) {
        return module.exports.resolveTarget(target);
    }).then(function(resolvedTarget) {
        var apk_path = build.findBestApkForArchitecture(buildResults, resolvedTarget.arch);
-        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 + '"';
-        return exec(cmd, os.tmpdir())
-        .then(function(output) {
-            if (output.match(/Failure/)) return Q.reject('ERROR: Failed to install apk to device: ' + output);
+        var manifest = new AndroidManifest(path.join(__dirname, '../../AndroidManifest.xml'));
+        var pkgName = manifest.getPackageId();
+        var launchName = pkgName + '/.' + manifest.getActivity().getName();
+        events.emit('log', 'Using apk: ' + apk_path);
+        events.emit('log', 'Package name: ' + pkgName);

-            //unlock screen
-            var cmd = 'adb -s ' + resolvedTarget.target + ' shell input keyevent 82';
-            return exec(cmd, os.tmpdir());
-        }, function(err) { return Q.reject('ERROR: Failed to install apk to device: ' + err); })
+        return Adb.install(resolvedTarget.target, apk_path, {replace: true})
+        .catch(function (error) {
+            // CB-9557 CB-10157 only uninstall and reinstall app if the one that
+            // is already installed on device was signed w/different certificate
+            if (!/INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES/.test(error.toString()))
+                throw error;
+
+            events.emit('warn', 'Uninstalling app from device and reinstalling it again because the ' +
+                'installed app already signed with different key');
+
+            // This promise is always resolved, even if 'adb uninstall' fails to uninstall app
+            // or the app doesn't installed at all, so no error catching needed.
+            return Adb.uninstall(resolvedTarget.target, pkgName)
+            .then(function() {
+                return Adb.install(resolvedTarget.target, apk_path, {replace: true});
+            });
+        })
        .then(function() {
-            // launch the application
-            console.log('Launching application...');
-            var cmd = 'adb -s ' + resolvedTarget.target + ' shell am start -W -a android.intent.action.MAIN -n ' + launchName;
-            return exec(cmd, os.tmpdir());
+            //unlock screen
+            return Adb.shell(resolvedTarget.target, 'input keyevent 82');
        }).then(function() {
-            console.log('LAUNCH SUCCESS');
-        }, function(err) {
-            return Q.reject('ERROR: Failed to launch application on device: ' + err);
+            return Adb.start(resolvedTarget.target, launchName);
+        }).then(function() {
+            events.emit('log', 'LAUNCH SUCCESS');
        });
    });
 };
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -21,11 +21,14 @@

 /* jshint sub:true */

-var exec       = require('./exec');
-var appinfo    = require('./appinfo');
 var retry      = require('./retry');
 var build      = require('./build');
-var check_reqs = require('./check_reqs');
+var path = require('path');
+var Adb = require('./Adb');
+var AndroidManifest = require('./AndroidManifest');
+var events = require('cordova-common').events;
+var spawn = require('cordova-common').superspawn.spawn;
+var CordovaError = require('cordova-common').CordovaError;

 var Q             = require('q');
 var os            = require('os');
@@ -33,8 +36,10 @@ var child_process = require('child_process');

 // constants
 var ONE_SECOND              = 1000; // in milliseconds
-var INSTALL_COMMAND_TIMEOUT = 120 * ONE_SECOND; // in milliseconds
+var ONE_MINUTE              = 60 * ONE_SECOND; // in milliseconds
+var INSTALL_COMMAND_TIMEOUT = 5 * ONE_MINUTE; // in milliseconds
 var NUM_INSTALL_RETRIES     = 3;
+var CHECK_BOOTED_INTERVAL   = 3 * ONE_SECOND; // in milliseconds
 var EXEC_KILL_SIGNAL        = 'SIGKILL';

 /**
@@ -48,7 +53,7 @@ var EXEC_KILL_SIGNAL        = 'SIGKILL';
   }
 */
 module.exports.list_images = function() {
-    return exec('android list avds')
+    return spawn('android', ['list', 'avds'])
    .then(function(output) {
        var response = output.split('\n');
        var emulator_list = [];
@@ -57,13 +62,18 @@ module.exports.list_images = function() {
            var img_obj = {};
            if (response[i].match(/Name:\s/)) {
                img_obj['name'] = response[i].split('Name: ')[1].replace('\r', '');
+                if (response[i + 1].match(/Device:\s/)) {
+                    i++;
+                    img_obj['device'] = response[i].split('Device: ')[1].replace('\r', '');
+                }
                if (response[i + 1].match(/Path:\s/)) {
                    i++;
                    img_obj['path'] = response[i].split('Path: ')[1].replace('\r', '');
                }
-                if (response[i + 1].match(/\(API\slevel\s/)) {
+                if (response[i + 1].match(/\(API\slevel\s/) || (response[i + 2] && response[i + 2].match(/\(API\slevel\s/))) {
                    i++;
-                    img_obj['target'] = response[i].replace('\r', '');
+                    var secondLine = response[i + 1].match(/\(API\slevel\s/) ? response[i + 1] : '';
+                    img_obj['target'] = (response[i] + secondLine).split('Target: ')[1].replace('\r', '');
                }
                if (response[i + 1].match(/ABI:\s/)) {
                    i++;
@@ -92,11 +102,15 @@ module.exports.list_images = function() {
 * Returns a promise.
 */
 module.exports.best_image = function() {
-    var project_target = check_reqs.get_target().replace('android-', '');
    return this.list_images()
    .then(function(images) {
+        // Just return undefined if there is no images
+        if (images.length === 0) return;
+
        var closest = 9999;
        var best = images[0];
+        // Loading check_reqs at run-time to avoid test-time vs run-time directory structure difference issue
+        var project_target = require('./check_reqs').get_target().replace('android-', '');
        for (var i in images) {
            var target = images[i].target;
            if(target) {
@@ -115,22 +129,12 @@ module.exports.best_image = function() {

 // Returns a promise.
 module.exports.list_started = function() {
-    return exec('adb devices', os.tmpdir())
-    .then(function(output) {
-        var response = output.split('\n');
-        var started_emulator_list = [];
-        for (var i = 1; i < response.length; i++) {
-            if (response[i].match(/device/) && response[i].match(/emulator/)) {
-                started_emulator_list.push(response[i].replace(/\tdevice/, '').replace('\r', ''));
-            }
-        }
-        return started_emulator_list;
-    });
+    return Adb.devices({emulators: true});
 };

 // Returns a promise.
 module.exports.list_targets = function() {
-    return exec('android list targets', os.tmpdir())
+    return spawn('android', ['list', 'targets'], {cwd: os.tmpdir()})
    .then(function(output) {
        var target_out = output.split('\n');
        var targets = [];
@@ -143,109 +147,140 @@ module.exports.list_targets = function() {
    });
 };

+/*
+ * Gets unused port for android emulator, between 5554 and 5584
+ * Returns a promise.
+ */
+module.exports.get_available_port = function () {
+    var self = this;
+
+    return self.list_started()
+    .then(function (emulators) {
+        for (var p = 5584; p >= 5554; p-=2) {
+            if (emulators.indexOf('emulator-' + p) === -1) {
+                events.emit('verbose', 'Found available port: ' + p);
+                return p;
+            }
+        }
+        throw new CordovaError('Could not find an available avd port');
+    });
+};
+
 /*
 * Starts an emulator with the given ID,
 * and returns the started ID of that emulator.
- * If no ID is given it will used the first image available,
+ * If no ID is given it will use the first image available,
 * if no image is available it will error out (maybe create one?).
+ * If no boot timeout is given or the value is negative it will wait forever for
+ * the emulator to boot
 *
 * Returns a promise.
 */
-module.exports.start = function(emulator_ID) {
+module.exports.start = function(emulator_ID, boot_timeout) {
    var self = this;
-    var emulator_id, num_started, started_emulators;

-    return self.list_started()
-    .then(function(list) {
-        started_emulators = list;
-        num_started = started_emulators.length;
-        if (!emulator_ID) {
-            return self.list_images()
-            .then(function(emulator_list) {
-                if (emulator_list.length > 0) {
-                    return self.best_image()
-                    .then(function(best) {
-                        emulator_ID = best.name;
-                        console.log('WARNING : no emulator specified, defaulting to ' + emulator_ID);
-                        return emulator_ID;
-                    });
-                } else {
-                    var androidCmd = check_reqs.getAbsoluteAndroidCmd();
-                    return Q.reject('ERROR : No emulator images (avds) found.\n' +
-                        '1. Download desired System Image by running: ' + androidCmd + ' sdk\n' +
-                        '2. Create an AVD by running: ' + androidCmd + ' avd\n' +
-                        'HINT: For a faster emulator, use an Intel System Image and install the HAXM device driver\n');
-                }
-            });
-        } else {
-            return Q(emulator_ID);
-        }
-    }).then(function() {
-        var cmd = 'emulator';
-        var args = ['-avd', emulator_ID];
-        var proc = child_process.spawn(cmd, args, { stdio: 'inherit', detached: true });
-        proc.unref(); // Don't wait for it to finish, since the emulator will probably keep running for a long time.
-    }).then(function() {
-        // wait for emulator to start
-        console.log('Waiting for emulator...');
-        return self.wait_for_emulator(num_started);
-    }).then(function(new_started) {
-        if (new_started.length > 1) {
-            for (var i in new_started) {
-                if (started_emulators.indexOf(new_started[i]) < 0) {
-                    emulator_id = new_started[i];
-                }
+    return Q().then(function() {
+        if (emulator_ID) return Q(emulator_ID);
+
+        return self.best_image()
+        .then(function(best) {
+            if (best && best.name) {
+                events.emit('warn', 'No emulator specified, defaulting to ' + best.name);
+                return best.name;
            }
-        } else {
-            emulator_id = new_started[0];
-        }
-        if (!emulator_id) return Q.reject('ERROR :  Failed to start emulator, could not find new emulator');
+
+            // Loading check_reqs at run-time to avoid test-time vs run-time directory structure difference issue
+            var androidCmd = require('./check_reqs').getAbsoluteAndroidCmd();
+            return Q.reject(new CordovaError('No emulator images (avds) found.\n' +
+                '1. Download desired System Image by running: ' + androidCmd + ' sdk\n' +
+                '2. Create an AVD by running: ' + androidCmd + ' avd\n' +
+                'HINT: For a faster emulator, use an Intel System Image and install the HAXM device driver\n'));
+        });
+    }).then(function(emulatorId) {
+        return self.get_available_port()
+        .then(function (port) {
+            var args = ['-avd', emulatorId, '-port', port];
+            // Don't wait for it to finish, since the emulator will probably keep running for a long time.
+            child_process
+                .spawn('emulator', args, { stdio: 'inherit', detached: true })
+                .unref();
+
+            // wait for emulator to start
+            events.emit('log', 'Waiting for emulator to start...');
+            return self.wait_for_emulator(port);
+        });
+    }).then(function(emulatorId) {
+        if (!emulatorId)
+            return Q.reject(new CordovaError('Failed to start emulator'));

        //wait for emulator to boot up
-        process.stdout.write('Booting up emulator (this may take a while)...');
-        return self.wait_for_boot(emulator_id);
-    }).then(function() {
-        console.log('BOOT COMPLETE');
-
-        //unlock screen
-        return exec('adb -s ' + emulator_id + ' shell input keyevent 82', os.tmpdir());
-    }).then(function() {
-        //return the new emulator id for the started emulators
-        return emulator_id;
+        process.stdout.write('Waiting for emulator to boot (this may take a while)...');
+        return self.wait_for_boot(emulatorId, boot_timeout)
+        .then(function(success) {
+            if (success) {
+                events.emit('log','BOOT COMPLETE');
+                //unlock screen
+                return Adb.shell(emulatorId, 'input keyevent 82')
+                .then(function() {
+                    //return the new emulator id for the started emulators
+                    return emulatorId;
+                });
+            } else {
+                // We timed out waiting for the boot to happen
+                return null;
+            }
+        });
    });
 };

 /*
- * Waits for the new emulator to apear on the started-emulator list.
- * Returns a promise with a list of newly started emulators' IDs.
+ * Waits for an emulator to boot on a given port.
+ * Returns this emulator's ID in a promise.
 */
-module.exports.wait_for_emulator = function(num_running) {
+module.exports.wait_for_emulator = function(port) {
    var self = this;
-    return self.list_started()
-    .then(function(new_started) {
-        if (new_started.length > num_running) {
-            return new_started;
-        } else {
-            return Q.delay(1000).then(function() {
-                return self.wait_for_emulator(num_running);
-            });
-        }
-    });
+    return Q().then(function() {
+        var emulator_id = 'emulator-' + port;
+        return Adb.shell(emulator_id, 'getprop dev.bootcomplete')
+        .then(function (output) {
+            if (output.indexOf('1') >= 0) {
+                return emulator_id;
+            }
+            return self.wait_for_emulator(port);
+        }, function (error) {
+            if (error && error.message &&
+            (error.message.indexOf('not found') > -1) ||
+            error.message.indexOf('device offline') > -1) {
+                // emulator not yet started, continue waiting
+                return self.wait_for_emulator(port);
+            } else {
+                // something unexpected has happened
+                throw error;
+            }
+        });
+     });
 };

 /*
- * Waits for the boot animation property of the emulator to switch to 'stopped'
+ * Waits for the core android process of the emulator to start. Returns a
+ * promise that resolves to a boolean indicating success. Not specifying a
+ * time_remaining or passing a negative value will cause it to wait forever
 */
-module.exports.wait_for_boot = function(emulator_id) {
+module.exports.wait_for_boot = function(emulator_id, time_remaining) {
    var self = this;
-    return exec('adb -s ' + emulator_id + ' shell getprop init.svc.bootanim', os.tmpdir())
+    return Adb.shell(emulator_id, 'ps')
    .then(function(output) {
-        if (output.match(/stopped/)) {
-            return;
+        if (output.match(/android\.process\.acore/)) {
+            return true;
+        } else if (time_remaining === 0) {
+            return false;
        } else {
            process.stdout.write('.');
-            return Q.delay(3000).then(function() {
-                return self.wait_for_boot(emulator_id);
+
+            // Check at regular intervals
+            return Q.delay(time_remaining < CHECK_BOOTED_INTERVAL ? time_remaining : CHECK_BOOTED_INTERVAL).then(function() {
+                var updated_time = time_remaining >= 0 ? Math.max(time_remaining - CHECK_BOOTED_INTERVAL, 0) : time_remaining;
+                return self.wait_for_boot(emulator_id, updated_time);
            });
        }
    });
@@ -257,9 +292,9 @@ module.exports.wait_for_boot = function(emulator_id) {
 * Returns a promise.
 */
 module.exports.create_image = function(name, target) {
-    console.log('Creating avd named ' + name);
+    console.log('Creating new avd named ' + name);
    if (target) {
-        return exec('android create avd --name ' + name + ' --target ' + target)
+        return spawn('android', ['create', 'avd', '--name', name, '--target', target])
        .then(null, function(error) {
            console.error('ERROR : Failed to create emulator image : ');
            console.error(' Do you have the latest android targets including ' + target + '?');
@@ -267,11 +302,11 @@ module.exports.create_image = function(name, target) {
        });
    } else {
        console.log('WARNING : Project target not found, creating avd with a different target but the project may fail to install.');
-        return exec('android create avd --name ' + name + ' --target ' + this.list_targets()[0])
+        return spawn('android', ['create', 'avd', '--name', name, '--target', this.list_targets()[0]])
        .then(function() {
            // TODO: This seems like another error case, even though it always happens.
            console.error('ERROR : Unable to create an avd emulator, no targets found.');
-            console.error('Please insure you have targets available by running the "android" command');
+            console.error('Ensure you have targets available by running the "android" command');
            return Q.reject();
        }, function(error) {
            console.error('ERROR : Failed to create emulator image : ');
@@ -284,7 +319,7 @@ module.exports.resolveTarget = function(target) {
    return this.list_started()
    .then(function(emulator_list) {
        if (emulator_list.length < 1) {
-            return Q.reject('No started emulators found, please start an emultor before deploying your project.');
+            return Q.reject('No running Android emulators found, please start an emulator before deploying your project.');
        }

        // default emulator
@@ -309,6 +344,8 @@ module.exports.resolveTarget = function(target) {
 module.exports.install = function(givenTarget, buildResults) {

    var target;
+    var manifest = new AndroidManifest(path.join(__dirname, '../../AndroidManifest.xml'));
+    var pkgName = manifest.getPackageId();

    // resolve the target emulator
    return Q().then(function () {
@@ -324,49 +361,83 @@ module.exports.install = function(givenTarget, buildResults) {

    // install the app
    }).then(function () {
+        // This promise is always resolved, even if 'adb uninstall' fails to uninstall app
+        // or the app doesn't installed at all, so no error catching needed.
+        return Q.when()
+        .then(function() {

-        var apk_path    = build.findBestApkForArchitecture(buildResults, target.arch);
-        var execOptions = {
-            timeout:    INSTALL_COMMAND_TIMEOUT, // in milliseconds
-            killSignal: EXEC_KILL_SIGNAL
-        };
+            var apk_path = build.findBestApkForArchitecture(buildResults, target.arch);
+            var execOptions = {
+                cwd: os.tmpdir(),
+                timeout:    INSTALL_COMMAND_TIMEOUT, // in milliseconds
+                killSignal: EXEC_KILL_SIGNAL
+            };

-        console.log('Installing app on emulator...');
-        console.log('Using apk: ' + apk_path);
+            events.emit('log', 'Using apk: ' + apk_path);
+            events.emit('log', 'Package name: ' + pkgName);
+            events.emit('verbose', 'Installing app on emulator...');

-        var retriedInstall = retry.retryPromise(
-            NUM_INSTALL_RETRIES,
-            exec, 'adb -s ' + target.target + ' install -r -d "' + apk_path + '"', os.tmpdir(), execOptions
-        );
+            // A special function to call adb install in specific environment w/ specific options.
+            // Introduced as a part of fix for http://issues.apache.org/jira/browse/CB-9119
+            // to workaround sporadic emulator hangs
+            function adbInstallWithOptions(target, apk, opts) {
+                events.emit('verbose', 'Installing apk ' + apk + ' on ' + target + '...');

-        return retriedInstall.then(function (output) {
-            if (output.match(/Failure/)) {
-                return Q.reject('Failed to install apk to emulator: ' + output);
-            } else {
-                console.log('INSTALL SUCCESS');
+                var command = 'adb -s ' + target + ' install -r "' + apk + '"';
+                return Q.promise(function (resolve, reject) {
+                    child_process.exec(command, opts, function(err, stdout, stderr) {
+                        if (err) reject(new CordovaError('Error executing "' + command + '": ' + stderr));
+                        // adb does not return an error code even if installation fails. Instead it puts a specific
+                        // message to stdout, so we have to use RegExp matching to detect installation failure.
+                        else if (/Failure/.test(stdout)) {
+                            if (stdout.match(/INSTALL_PARSE_FAILED_NO_CERTIFICATES/)) {
+                                stdout += 'Sign the build using \'-- --keystore\' or \'--buildConfig\'' +
+                                    ' or sign and deploy the unsigned apk manually using Android tools.';
+                            } else if (stdout.match(/INSTALL_FAILED_VERSION_DOWNGRADE/)) {
+                                stdout += 'You\'re trying to install apk with a lower versionCode that is already installed.' +
+                                    '\nEither uninstall an app or increment the versionCode.';
+                            }
+
+                            reject(new CordovaError('Failed to install apk to emulator: ' + stdout));
+                        } else resolve(stdout);
+                    });
+                });
            }
-        }, function (err) {
-            return Q.reject('Failed to install apk to emulator: ' + err);
-        });

+            function installPromise () {
+                return adbInstallWithOptions(target.target, apk_path, execOptions)
+                .catch(function (error) {
+                    // CB-9557 CB-10157 only uninstall and reinstall app if the one that
+                    // is already installed on device was signed w/different certificate
+                    if (!/INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES/.test(error.toString()))
+                        throw error;
+
+                    events.emit('warn', 'Uninstalling app from device and reinstalling it because the ' +
+                        'currently installed app was signed with different key');
+
+                    // This promise is always resolved, even if 'adb uninstall' fails to uninstall app
+                    // or the app doesn't installed at all, so no error catching needed.
+                    return Adb.uninstall(target.target, pkgName)
+                    .then(function() {
+                        return adbInstallWithOptions(target.target, apk_path, execOptions);
+                    });
+                });
+            }
+
+            return retry.retryPromise(NUM_INSTALL_RETRIES, installPromise)
+            .then(function (output) {
+                events.emit('log', 'INSTALL SUCCESS');
+            });
+        });
    // unlock screen
    }).then(function () {

-        console.log('Unlocking screen...');
-        return exec('adb -s ' + target.target + ' shell input keyevent 82', os.tmpdir());
-
-    // launch the application
+        events.emit('verbose', 'Unlocking screen...');
+        return Adb.shell(target.target, 'input keyevent 82');
    }).then(function () {
-
-        console.log('Launching application...');
-        var launchName = appinfo.getActivityName();
-        var cmd = 'adb -s ' + target.target + ' shell am start -W -a android.intent.action.MAIN -n ' + launchName;
-        return exec(cmd, os.tmpdir());
-
+        Adb.start(target.target, pkgName + '/.' + manifest.getActivity().getName());
    // report success or failure
    }).then(function (output) {
-        console.log('LAUNCH SUCCESS');
-    }, function (err) {
-        return Q.reject('Failed to launch app on emulator: ' + err);
+        events.emit('log', 'LAUNCH SUCCESS');
    });
 };
--- a/bin/templates/cordova/lib/exec.js
+++ b/bin/templates/cordova/lib/exec.js
@@ -1,68 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var child_process = require("child_process");
-var Q             = require("q");
-
-// constants
-var DEFAULT_MAX_BUFFER = 1024000;
-
-// Takes a command and optional current working directory.
-// Returns a promise that either resolves with the stdout, or
-// rejects with an error message and the stderr.
-//
-// WARNING:
-//         opt_cwd is an artifact of an old design, and must
-//         be removed in the future; the correct solution is
-//         to pass the options object the same way that
-//         child_process.exec expects
-//
-// NOTE:
-//      exec documented here - https://nodejs.org/api/child_process.html#child_process_child_process_exec_command_options_callback
-module.exports = function(cmd, opt_cwd, options) {
-
-    var d = Q.defer();
-
-    if (typeof options === "undefined") {
-        options = {};
-    }
-
-    // override cwd to preserve old opt_cwd behavior
-    options.cwd = opt_cwd;
-
-    // set maxBuffer
-    if (typeof options.maxBuffer === "undefined") {
-        options.maxBuffer = DEFAULT_MAX_BUFFER;
-    }
-
-    try {
-        child_process.exec(cmd, options, function(err, stdout, stderr) {
-            if (err) d.reject("Error executing \"" + cmd + "\": " + stderr);
-            else d.resolve(stdout);
-        });
-    } catch(e) {
-        console.error("error caught: " + e);
-        d.reject(e);
-    }
-
-    return d.promise;
-};
-
--- a/bin/templates/cordova/lib/list-devices
+++ b/bin/templates/cordova/lib/list-devices
@@ -22,12 +22,13 @@
 var devices = require('./device');

 // Usage support for when args are given
-devices.list().done(function(device_list) {
-    device_list && device_list.forEach(function(dev) {
-        console.log(dev);
+require('../lib/check_reqs').check_android().then(function() {
+    devices.list().done(function(device_list) {
+        device_list && device_list.forEach(function(dev) {
+            console.log(dev);
+        });
+    }, function(err) {
+        console.error('ERROR: ' + err);
+        process.exit(2);
    });
-}, function(err) {
-    console.error('ERROR: ' + err);
-    process.exit(2);
 });
-
--- a/bin/templates/cordova/lib/list-emulator-images
+++ b/bin/templates/cordova/lib/list-emulator-images
@@ -22,11 +22,13 @@
 var emulators = require('./emulator');

 // Usage support for when args are given
-emulators.list_images().done(function(emulator_list) {
-    emulator_list && emulator_list.forEach(function(emu) {
-        console.log(emu.name);
+require('../lib/check_reqs').check_android().then(function() {
+    emulators.list_images().done(function(emulator_list) {
+        emulator_list && emulator_list.forEach(function(emu) {
+            console.log(emu.name);
+        });
+    }, function(err) {
+        console.error('ERROR: ' + err);
+        process.exit(2);
    });
-}, function(err) {
-    console.error('ERROR: ' + err);
-    process.exit(2);
 });
--- a/bin/templates/cordova/lib/list-started-emulators
+++ b/bin/templates/cordova/lib/list-started-emulators
@@ -22,11 +22,13 @@
 var emulators = require('./emulator');

 // Usage support for when args are given
-emulators.list_started().done(function(emulator_list) {
-    emulator_list && emulator_list.forEach(function(emu) {
-        console.log(emu);
+require('../lib/check_reqs').check_android().then(function() {
+    emulators.list_started().done(function(emulator_list) {
+        emulator_list && emulator_list.forEach(function(emu) {
+            console.log(emu);
+        });
+    }, function(err) {
+        console.error('ERROR: ' + err);
+        process.exit(2);
    });
-}, function(err) {
-    console.error('ERROR: ' + err);
-    process.exit(2);
 });
--- a/bin/templates/cordova/lib/plugin-build.gradle
+++ b/bin/templates/cordova/lib/plugin-build.gradle
@@ -42,7 +42,7 @@ buildscript {
    }
 }

-apply plugin: 'android-library'
+apply plugin: 'com.android.library'

 dependencies {
    compile fileTree(dir: 'libs', include: '*.jar')
--- a/bin/templates/cordova/lib/pluginHandlers.js
+++ b/bin/templates/cordova/lib/pluginHandlers.js
@@ -0,0 +1,276 @@
+/*
+ *
+ * Copyright 2013 Anis Kadri
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+/* jshint unused: vars */
+
+var fs = require('fs');
+var path = require('path');
+var shell = require('shelljs');
+var events = require('cordova-common').events;
+var CordovaError = require('cordova-common').CordovaError;
+
+var handlers = {
+    'source-file':{
+        install:function(obj, plugin, project, options) {
+            if (!obj.src) throw new CordovaError(generateAttributeError('src', 'source-file', plugin.id));
+            if (!obj.targetDir) throw new CordovaError(generateAttributeError('target-dir', 'source-file', plugin.id));
+            var dest = path.join(obj.targetDir, path.basename(obj.src));
+            if (options && options.force) {
+                copyFile(plugin.dir, obj.src, project.projectDir, dest, !!(options && options.link));
+            } else {
+                copyNewFile(plugin.dir, obj.src, project.projectDir, dest, !!(options && options.link));
+            }
+        },
+        uninstall:function(obj, plugin, project, options) {
+            var dest = path.join(obj.targetDir, path.basename(obj.src));
+            deleteJava(project.projectDir, dest);
+        }
+    },
+    'lib-file':{
+        install:function(obj, plugin, project, options) {
+            var dest = path.join('libs', path.basename(obj.src));
+            copyFile(plugin.dir, obj.src, project.projectDir, dest, !!(options && options.link));
+        },
+        uninstall:function(obj, plugin, project, options) {
+            var dest = path.join('libs', path.basename(obj.src));
+            removeFile(project.projectDir, dest);
+        }
+    },
+    'resource-file':{
+        install:function(obj, plugin, project, options) {
+            copyFile(plugin.dir, obj.src, project.projectDir, path.normalize(obj.target), !!(options && options.link));
+        },
+        uninstall:function(obj, plugin, project, options) {
+            removeFile(project.projectDir, path.normalize(obj.target));
+        }
+    },
+    'framework': {
+        install:function(obj, plugin, project, options) {
+            var src = obj.src;
+            if (!src) throw new CordovaError(generateAttributeError('src', 'framework', plugin.id));
+
+            events.emit('verbose', 'Installing Android library: ' + src);
+            var parentDir = obj.parent ? path.resolve(project.projectDir, obj.parent) : project.projectDir;
+            var subDir;
+
+            if (obj.custom) {
+                var subRelativeDir = project.getCustomSubprojectRelativeDir(plugin.id, src);
+                copyNewFile(plugin.dir, src, project.projectDir, subRelativeDir, !!(options && options.link));
+                subDir = path.resolve(project.projectDir, subRelativeDir);
+            } else {
+                obj.type = 'sys';
+                subDir = src;
+            }
+
+            if (obj.type == 'gradleReference') {
+                project.addGradleReference(parentDir, subDir);
+            } else if (obj.type == 'sys') {
+                project.addSystemLibrary(parentDir, subDir);
+            } else {
+                project.addSubProject(parentDir, subDir);
+            }
+        },
+        uninstall:function(obj, plugin, project, options) {
+            var src = obj.src;
+            if (!src) throw new CordovaError(generateAttributeError('src', 'framework', plugin.id));
+
+            events.emit('verbose', 'Uninstalling Android library: ' + src);
+            var parentDir = obj.parent ? path.resolve(project.projectDir, obj.parent) : project.projectDir;
+            var subDir;
+
+            if (obj.custom) {
+                var subRelativeDir = project.getCustomSubprojectRelativeDir(plugin.id, src);
+                removeFile(project.projectDir, subRelativeDir);
+                subDir = path.resolve(project.projectDir, subRelativeDir);
+                // If it's the last framework in the plugin, remove the parent directory.
+                var parDir = path.dirname(subDir);
+                if (fs.existsSync(parDir) && fs.readdirSync(parDir).length === 0) {
+                    fs.rmdirSync(parDir);
+                }
+            } else {
+                obj.type = 'sys';
+                subDir = src;
+            }
+
+            if (obj.type == 'gradleReference') {
+                project.removeGradleReference(parentDir, subDir);
+            } else if (obj.type == 'sys') {
+                project.removeSystemLibrary(parentDir, subDir);
+            } else {
+                project.removeSubProject(parentDir, subDir);
+            }
+        }
+    },
+    asset:{
+        install:function(obj, plugin, project, options) {
+            if (!obj.src) {
+                throw new CordovaError(generateAttributeError('src', 'asset', plugin.id));
+            }
+            if (!obj.target) {
+                throw new CordovaError(generateAttributeError('target', 'asset', plugin.id));
+            }
+
+            copyFile(plugin.dir, obj.src, project.www, obj.target);
+            if (options && options.usePlatformWww) {
+                // CB-11022 copy file to both directories if usePlatformWww is specified
+                copyFile(plugin.dir, obj.src, project.platformWww, obj.target);
+            }
+        },
+        uninstall:function(obj, plugin, project, options) {
+            var target = obj.target || obj.src;
+
+            if (!target) throw new CordovaError(generateAttributeError('target', 'asset', plugin.id));
+
+            removeFileF(path.resolve(project.www, target));
+            removeFileF(path.resolve(project.www, 'plugins', plugin.id));
+            if (options && options.usePlatformWww) {
+                // CB-11022 remove file from both directories if usePlatformWww is specified
+                removeFileF(path.resolve(project.platformWww, target));
+                removeFileF(path.resolve(project.platformWww, 'plugins', plugin.id));
+            }
+        }
+    },
+    'js-module': {
+        install: function (obj, plugin, project, options) {
+            // Copy the plugin's files into the www directory.
+            var moduleSource = path.resolve(plugin.dir, obj.src);
+            var moduleName = plugin.id + '.' + (obj.name || path.basename(obj.src, path.extname (obj.src)));
+
+            // Read in the file, prepend the cordova.define, and write it back out.
+            var scriptContent = fs.readFileSync(moduleSource, 'utf-8').replace(/^\ufeff/, ''); // Window BOM
+            if (moduleSource.match(/.*\.json$/)) {
+                scriptContent = 'module.exports = ' + scriptContent;
+            }
+            scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) {\n' + scriptContent + '\n});\n';
+
+            var wwwDest = path.resolve(project.www, 'plugins', plugin.id, obj.src);
+            shell.mkdir('-p', path.dirname(wwwDest));
+            fs.writeFileSync(wwwDest, scriptContent, 'utf-8');
+
+            if (options && options.usePlatformWww) {
+                // CB-11022 copy file to both directories if usePlatformWww is specified
+                var platformWwwDest = path.resolve(project.platformWww, 'plugins', plugin.id, obj.src);
+                shell.mkdir('-p', path.dirname(platformWwwDest));
+                fs.writeFileSync(platformWwwDest, scriptContent, 'utf-8');
+            }
+        },
+        uninstall: function (obj, plugin, project, options) {
+            var pluginRelativePath = path.join('plugins', plugin.id, obj.src);
+            removeFileAndParents(project.www, pluginRelativePath);
+            if (options && options.usePlatformWww) {
+                // CB-11022 remove file from both directories if usePlatformWww is specified
+                removeFileAndParents(project.platformWww, pluginRelativePath);
+            }
+        }
+    }
+};
+
+module.exports.getInstaller = function (type) {
+    if (handlers[type] && handlers[type].install) {
+        return handlers[type].install;
+    }
+
+    events.emit('verbose', '<' + type + '> is not supported for android plugins');
+};
+
+module.exports.getUninstaller = function(type) {
+    if (handlers[type] && handlers[type].uninstall) {
+        return handlers[type].uninstall;
+    }
+
+    events.emit('verbose', '<' + type + '> is not supported for android plugins');
+};
+
+function copyFile (plugin_dir, src, project_dir, dest, link) {
+    src = path.resolve(plugin_dir, src);
+    if (!fs.existsSync(src)) throw new CordovaError('"' + src + '" not found!');
+
+    // check that src path is inside plugin directory
+    var real_path = fs.realpathSync(src);
+    var real_plugin_path = fs.realpathSync(plugin_dir);
+    if (real_path.indexOf(real_plugin_path) !== 0)
+        throw new CordovaError('File "' + src + '" is located outside the plugin directory "' + plugin_dir + '"');
+
+    dest = path.resolve(project_dir, dest);
+
+    // check that dest path is located in project directory
+    if (dest.indexOf(project_dir) !== 0)
+        throw new CordovaError('Destination "' + dest + '" for source file "' + src + '" is located outside the project');
+
+    shell.mkdir('-p', path.dirname(dest));
+
+    if (link) {
+        fs.symlinkSync(path.relative(path.dirname(dest), src), dest);
+    } else if (fs.statSync(src).isDirectory()) {
+        // XXX shelljs decides to create a directory when -R|-r is used which sucks. http://goo.gl/nbsjq
+        shell.cp('-Rf', src+'/*', dest);
+    } else {
+        shell.cp('-f', src, dest);
+    }
+}
+
+// Same as copy file but throws error if target exists
+function copyNewFile (plugin_dir, src, project_dir, dest, link) {
+    var target_path = path.resolve(project_dir, dest);
+    if (fs.existsSync(target_path))
+        throw new CordovaError('"' + target_path + '" already exists!');
+
+    copyFile(plugin_dir, src, project_dir, dest, !!link);
+}
+
+// checks if file exists and then deletes. Error if doesn't exist
+function removeFile (project_dir, src) {
+    var file = path.resolve(project_dir, src);
+    shell.rm('-Rf', file);
+}
+
+// deletes file/directory without checking
+function removeFileF (file) {
+    shell.rm('-Rf', file);
+}
+
+// Sometimes we want to remove some java, and prune any unnecessary empty directories
+function deleteJava (project_dir, destFile) {
+    removeFileAndParents(project_dir, destFile, 'src');
+}
+
+function removeFileAndParents (baseDir, destFile, stopper) {
+    stopper = stopper || '.';
+    var file = path.resolve(baseDir, destFile);
+    if (!fs.existsSync(file)) return;
+
+    removeFileF(file);
+
+    // check if directory is empty
+    var curDir = path.dirname(file);
+
+    while(curDir !== path.resolve(baseDir, stopper)) {
+        if(fs.existsSync(curDir) && fs.readdirSync(curDir).length === 0) {
+            fs.rmdirSync(curDir);
+            curDir = path.resolve(curDir, '..');
+        } else {
+            // directory not empty...do nothing
+            break;
+        }
+    }
+}
+
+function generateAttributeError(attribute, element, id) {
+    return 'Required attribute "' + attribute + '" not specified in <' + element + '> element from plugin: ' + id;
+}
--- a/bin/templates/cordova/lib/prepare.js
+++ b/bin/templates/cordova/lib/prepare.js
@@ -0,0 +1,434 @@
+/**
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+
+var Q = require('q');
+var fs = require('fs');
+var path = require('path');
+var shell = require('shelljs');
+var events = require('cordova-common').events;
+var AndroidManifest = require('./AndroidManifest');
+var xmlHelpers = require('cordova-common').xmlHelpers;
+var CordovaError = require('cordova-common').CordovaError;
+var ConfigParser = require('cordova-common').ConfigParser;
+var FileUpdater = require('cordova-common').FileUpdater;
+var PlatformJson = require('cordova-common').PlatformJson;
+var PlatformMunger = require('cordova-common').ConfigChanges.PlatformMunger;
+var PluginInfoProvider = require('cordova-common').PluginInfoProvider;
+
+module.exports.prepare = function (cordovaProject, options) {
+    var self = this;
+    var platformResourcesDir = path.relative(cordovaProject.root, path.join(this.locations.root, 'res'));
+
+    var platformJson = PlatformJson.load(this.locations.root, this.platform);
+    var munger = new PlatformMunger(this.platform, this.locations.root, platformJson, new PluginInfoProvider());
+
+    this._config = updateConfigFilesFrom(cordovaProject.projectConfig, munger, this.locations);
+
+    // Update own www dir with project's www assets and plugins' assets and js-files
+    return Q.when(updateWww(cordovaProject, this.locations))
+    .then(function () {
+        // update project according to config.xml changes.
+        return updateProjectAccordingTo(self._config, self.locations);
+    })
+    .then(function () {
+        updateIcons(cordovaProject, platformResourcesDir);
+        updateSplashes(cordovaProject, platformResourcesDir);
+    })
+    .then(function () {
+        events.emit('verbose', 'Prepared android project successfully');
+    });
+};
+
+module.exports.clean = function (options) {
+    // A cordovaProject isn't passed into the clean() function, because it might have
+    // been called from the platform shell script rather than the CLI. Check for the
+    // noPrepare option passed in by the non-CLI clean script. If that's present, or if
+    // there's no config.xml found at the project root, then don't clean prepared files.
+    var projectRoot = path.resolve(this.root, '../..');
+    var projectConfigFile = path.join(projectRoot, 'config.xml');
+    if ((options && options.noPrepare) || !fs.existsSync(projectConfigFile) ||
+            !fs.existsSync(this.locations.configXml)) {
+        return Q();
+    }
+
+    var projectConfig = new ConfigParser(this.locations.configXml);
+    var platformResourcesDir = path.relative(projectRoot, path.join(this.locations.root, 'res'));
+
+    var self = this;
+    return Q().then(function () {
+        cleanWww(projectRoot, self.locations);
+        cleanIcons(projectRoot, projectConfig, platformResourcesDir);
+        cleanSplashes(projectRoot, projectConfig, platformResourcesDir);
+    });
+};
+
+/**
+ * Updates config files in project based on app's config.xml and config munge,
+ *   generated by plugins.
+ *
+ * @param   {ConfigParser}   sourceConfig  A project's configuration that will
+ *   be merged into platform's config.xml
+ * @param   {ConfigChanges}  configMunger  An initialized ConfigChanges instance
+ *   for this platform.
+ * @param   {Object}         locations     A map of locations for this platform
+ *
+ * @return  {ConfigParser}                 An instance of ConfigParser, that
+ *   represents current project's configuration. When returned, the
+ *   configuration is already dumped to appropriate config.xml file.
+ */
+function updateConfigFilesFrom(sourceConfig, configMunger, locations) {
+    events.emit('verbose', 'Generating platform-specific config.xml from defaults for android at ' + locations.configXml);
+
+    // First cleanup current config and merge project's one into own
+    // Overwrite platform config.xml with defaults.xml.
+    shell.cp('-f', locations.defaultConfigXml, locations.configXml);
+
+    // Then apply config changes from global munge to all config files
+    // in project (including project's config)
+    configMunger.reapply_global_munge().save_all();
+
+    events.emit('verbose', 'Merging project\'s config.xml into platform-specific android config.xml');
+    // Merge changes from app's config.xml into platform's one
+    var config = new ConfigParser(locations.configXml);
+    xmlHelpers.mergeXml(sourceConfig.doc.getroot(),
+        config.doc.getroot(), 'android', /*clobber=*/true);
+
+    config.write();
+    return config;
+}
+
+/**
+ * Logs all file operations via the verbose event stream, indented.
+ */
+function logFileOp(message) {
+    events.emit('verbose', '  ' + message);
+}
+
+/**
+ * Updates platform 'www' directory by replacing it with contents of
+ *   'platform_www' and app www. Also copies project's overrides' folder into
+ *   the platform 'www' folder
+ *
+ * @param   {Object}  cordovaProject    An object which describes cordova project.
+ * @param   {Object}  destinations      An object that contains destination
+ *   paths for www files.
+ */
+function updateWww(cordovaProject, destinations) {
+    var sourceDirs = [
+        path.relative(cordovaProject.root, cordovaProject.locations.www),
+        path.relative(cordovaProject.root, destinations.platformWww)
+    ];
+
+    // If project contains 'merges' for our platform, use them as another overrides
+    var merges_path = path.join(cordovaProject.root, 'merges', 'android');
+    if (fs.existsSync(merges_path)) {
+        events.emit('verbose', 'Found "merges/android" folder. Copying its contents into the android project.');
+        sourceDirs.push(path.join('merges', 'android'));
+    }
+
+    var targetDir = path.relative(cordovaProject.root, destinations.www);
+    events.emit(
+        'verbose', 'Merging and updating files from [' + sourceDirs.join(', ') + '] to ' + targetDir);
+    FileUpdater.mergeAndUpdateDir(
+        sourceDirs, targetDir, { rootDir: cordovaProject.root }, logFileOp);
+}
+
+/**
+ * Cleans all files from the platform 'www' directory.
+ */
+function cleanWww(projectRoot, locations) {
+    var targetDir = path.relative(projectRoot, locations.www);
+    events.emit('verbose', 'Cleaning ' + targetDir);
+
+    // No source paths are specified, so mergeAndUpdateDir() will clear the target directory.
+    FileUpdater.mergeAndUpdateDir(
+        [], targetDir, { rootDir: projectRoot, all: true }, logFileOp);
+}
+
+/**
+ * Updates project structure and AndroidManifest according to project's configuration.
+ *
+ * @param   {ConfigParser}  platformConfig  A project's configuration that will
+ *   be used to update project
+ * @param   {Object}  locations       A map of locations for this platform
+ */
+function updateProjectAccordingTo(platformConfig, locations) {
+    // Update app name by editing res/values/strings.xml
+    var name = platformConfig.name();
+    var strings = xmlHelpers.parseElementtreeSync(locations.strings);
+    strings.find('string[@name="app_name"]').text = name;
+    fs.writeFileSync(locations.strings, strings.write({indent: 4}), 'utf-8');
+    events.emit('verbose', 'Wrote out android application name "' + name + '" to ' + locations.strings);
+
+    // Java packages cannot support dashes
+    var pkg = (platformConfig.android_packageName() || platformConfig.packageName()).replace(/-/g, '_');
+
+    var manifest = new AndroidManifest(locations.manifest);
+    var orig_pkg = manifest.getPackageId();
+
+    manifest.getActivity()
+        .setOrientation(platformConfig.getPreference('orientation'))
+        .setLaunchMode(findAndroidLaunchModePreference(platformConfig));
+
+    manifest.setVersionName(platformConfig.version())
+        .setVersionCode(platformConfig.android_versionCode() || default_versionCode(platformConfig.version()))
+        .setPackageId(pkg)
+        .setMinSdkVersion(platformConfig.getPreference('android-minSdkVersion', 'android'))
+        .setMaxSdkVersion(platformConfig.getPreference('android-maxSdkVersion', 'android'))
+        .setTargetSdkVersion(platformConfig.getPreference('android-targetSdkVersion', 'android'))
+        .write();
+
+    var javaPattern = path.join(locations.root, 'src', orig_pkg.replace(/\./g, '/'), '*.java');
+    var java_files = shell.ls(javaPattern).filter(function(f) {
+        return shell.grep(/extends\s+CordovaActivity/g, f);
+    });
+
+    if (java_files.length === 0) {
+        throw new CordovaError('No Java files found that extend CordovaActivity.');
+    } else if(java_files.length > 1) {
+        events.emit('log', 'Multiple candidate Java files that extend CordovaActivity found. Guessing at the first one, ' + java_files[0]);
+    }
+
+    var destFile = path.join(locations.root, 'src', pkg.replace(/\./g, '/'), path.basename(java_files[0]));
+    shell.mkdir('-p', path.dirname(destFile));
+    shell.sed(/package [\w\.]*;/, 'package ' + pkg + ';', java_files[0]).to(destFile);
+    events.emit('verbose', 'Wrote out Android package name "' + pkg + '" to ' + destFile);
+
+    if (orig_pkg !== pkg) {
+        // If package was name changed we need to remove old java with main activity
+        shell.rm('-Rf',java_files[0]);
+        // remove any empty directories
+        var currentDir = path.dirname(java_files[0]);
+        var sourcesRoot = path.resolve(locations.root, 'src');
+        while(currentDir !== sourcesRoot) {
+            if(fs.existsSync(currentDir) && fs.readdirSync(currentDir).length === 0) {
+                fs.rmdirSync(currentDir);
+                currentDir = path.resolve(currentDir, '..');
+            } else {
+                break;
+            }
+        }
+    }
+}
+
+// Consturct the default value for versionCode as
+// PATCH + MINOR * 100 + MAJOR * 10000
+// see http://developer.android.com/tools/publishing/versioning.html
+function default_versionCode(version) {
+    var nums = version.split('-')[0].split('.');
+    var versionCode = 0;
+    if (+nums[0]) {
+        versionCode += +nums[0] * 10000;
+    }
+    if (+nums[1]) {
+        versionCode += +nums[1] * 100;
+    }
+    if (+nums[2]) {
+        versionCode += +nums[2];
+    }
+
+    events.emit('verbose', 'android-versionCode not found in config.xml. Generating a code based on version in config.xml (' + version + '): ' + versionCode);
+    return versionCode;
+}
+
+function getImageResourcePath(resourcesDir, density, name, sourceName) {
+    if (/\.9\.png$/.test(sourceName)) {
+        name = name.replace(/\.png$/, '.9.png');
+    }
+    var resourcePath = path.join(resourcesDir, (density ? 'drawable-' + density : 'drawable'), name);
+    return resourcePath;
+}
+
+function updateSplashes(cordovaProject, platformResourcesDir) {
+    var resources = cordovaProject.projectConfig.getSplashScreens('android');
+
+    // if there are "splash" elements in config.xml
+    if (resources.length === 0) {
+        events.emit('verbose', 'This app does not have splash screens defined');
+        return;
+    }
+
+    var resourceMap = mapImageResources(cordovaProject.root, platformResourcesDir, 'screen.png');
+
+    var hadMdpi = false;
+    resources.forEach(function (resource) {
+        if (!resource.density) {
+            return;
+        }
+        if (resource.density == 'mdpi') {
+            hadMdpi = true;
+        }
+        var targetPath = getImageResourcePath(
+            platformResourcesDir, resource.density, 'screen.png', path.basename(resource.src));
+        resourceMap[targetPath] = resource.src;
+    });
+
+    // There's no "default" drawable, so assume default == mdpi.
+    if (!hadMdpi && resources.defaultResource) {
+        var targetPath = getImageResourcePath(
+            platformResourcesDir, 'mdpi', 'screen.png', path.basename(resources.defaultResource.src));
+        resourceMap[targetPath] = resources.defaultResource.src;
+    }
+
+    events.emit('verbose', 'Updating splash screens at ' + platformResourcesDir);
+    FileUpdater.updatePaths(
+        resourceMap, { rootDir: cordovaProject.root }, logFileOp);
+}
+
+function cleanSplashes(projectRoot, projectConfig, platformResourcesDir) {
+    var resources = projectConfig.getSplashScreens('android');
+    if (resources.length > 0) {
+        var resourceMap = mapImageResources(projectRoot, platformResourcesDir, 'screen.png');
+        events.emit('verbose', 'Cleaning splash screens at ' + platformResourcesDir);
+
+        // No source paths are specified in the map, so updatePaths() will delete the target files.
+        FileUpdater.updatePaths(
+            resourceMap, { rootDir: projectRoot, all: true }, logFileOp);
+    }
+}
+
+function updateIcons(cordovaProject, platformResourcesDir) {
+    var icons = cordovaProject.projectConfig.getIcons('android');
+
+    // if there are icon elements in config.xml
+    if (icons.length === 0) {
+        events.emit('verbose', 'This app does not have launcher icons defined');
+        return;
+    }
+
+    var resourceMap = mapImageResources(cordovaProject.root, platformResourcesDir, 'icon.png');
+
+    var android_icons = {};
+    var default_icon;
+    // http://developer.android.com/design/style/iconography.html
+    var sizeToDensityMap = {
+        36: 'ldpi',
+        48: 'mdpi',
+        72: 'hdpi',
+        96: 'xhdpi',
+        144: 'xxhdpi',
+        192: 'xxxhdpi'
+    };
+    // find the best matching icon for a given density or size
+    // @output android_icons
+    var parseIcon = function(icon, icon_size) {
+        // do I have a platform icon for that density already
+        var density = icon.density || sizeToDensityMap[icon_size];
+        if (!density) {
+            // invalid icon defition ( or unsupported size)
+            return;
+        }
+        var previous = android_icons[density];
+        if (previous && previous.platform) {
+            return;
+        }
+        android_icons[density] = icon;
+    };
+
+    // iterate over all icon elements to find the default icon and call parseIcon
+    for (var i=0; i<icons.length; i++) {
+        var icon = icons[i];
+        var size = icon.width;
+        if (!size) {
+            size = icon.height;
+        }
+        if (!size && !icon.density) {
+            if (default_icon) {
+                events.emit('verbose', 'Found extra default icon: ' + icon.src + ' (ignoring in favor of ' + default_icon.src + ')');
+            } else {
+                default_icon = icon;
+            }
+        } else {
+            parseIcon(icon, size);
+        }
+    }
+
+    // The source paths for icons and splashes are relative to
+    // project's config.xml location, so we use it as base path.
+    for (var density in android_icons) {
+        var targetPath = getImageResourcePath(
+            platformResourcesDir, density, 'icon.png', path.basename(android_icons[density].src));
+        resourceMap[targetPath] = android_icons[density].src;
+    }
+
+    // There's no "default" drawable, so assume default == mdpi.
+    if (default_icon && !android_icons.mdpi) {
+        var defaultTargetPath = getImageResourcePath(
+            platformResourcesDir, 'mdpi', 'icon.png', path.basename(default_icon.src));
+        resourceMap[defaultTargetPath] = default_icon.src;
+    }
+
+    events.emit('verbose', 'Updating icons at ' + platformResourcesDir);
+    FileUpdater.updatePaths(
+        resourceMap, { rootDir: cordovaProject.root }, logFileOp);
+}
+
+function cleanIcons(projectRoot, projectConfig, platformResourcesDir) {
+    var icons = projectConfig.getIcons('android');
+    if (icons.length > 0) {
+        var resourceMap = mapImageResources(projectRoot, platformResourcesDir, 'icon.png');
+        events.emit('verbose', 'Cleaning icons at ' + platformResourcesDir);
+
+        // No source paths are specified in the map, so updatePaths() will delete the target files.
+        FileUpdater.updatePaths(
+            resourceMap, { rootDir: projectRoot, all: true }, logFileOp);
+    }
+}
+
+/**
+ * Gets a map containing resources of a specified name from all drawable folders in a directory.
+ */
+function mapImageResources(rootDir, subDir, resourceName) {
+    var pathMap = {};
+    shell.ls(path.join(rootDir, subDir, 'drawable-*'))
+    .forEach(function (drawableFolder) {
+        var imagePath = path.join(subDir, path.basename(drawableFolder), resourceName);
+        pathMap[imagePath] = null;
+    });
+    return pathMap;
+}
+
+/**
+ * Gets and validates 'AndroidLaunchMode' prepference from config.xml. Returns
+ *   preference value and warns if it doesn't seems to be valid
+ *
+ * @param   {ConfigParser}  platformConfig  A configParser instance for
+ *   platform.
+ *
+ * @return  {String}                  Preference's value from config.xml or
+ *   default value, if there is no such preference. The default value is
+ *   'singleTop'
+ */
+function findAndroidLaunchModePreference(platformConfig) {
+    var launchMode = platformConfig.getPreference('AndroidLaunchMode');
+    if (!launchMode) {
+        // Return a default value
+        return 'singleTop';
+    }
+
+    var expectedValues = ['standard', 'singleTop', 'singleTask', 'singleInstance'];
+    var valid = expectedValues.indexOf(launchMode) >= 0;
+    if (!valid) {
+        // Note: warn, but leave the launch mode as developer wanted, in case the list of options changes in the future
+        events.emit('warn', 'Unrecognized value for AndroidLaunchMode preference: ' +
+            launchMode + '. Expected values are: ' + expectedValues.join(', '));
+    }
+
+    return launchMode;
+}
--- a/bin/templates/cordova/lib/retry.js
+++ b/bin/templates/cordova/lib/retry.js
@@ -21,7 +21,9 @@

 /* jshint node: true */

-"use strict";
+'use strict';
+
+var events = require('cordova-common').events;

 /*
 * Retry a promise-returning function a number of times, propagating its
@@ -56,7 +58,7 @@ module.exports.retryPromise = function (attemts_left, promiseFunction) {
                throw error;
            }

-            console.log("A retried call failed. Retrying " + attemts_left + " more time(s).");
+            events.emit('verbose', 'A retried call failed. Retrying ' + attemts_left + ' more time(s).');

            // retry call self again with the same arguments, except attemts_left is now lower
            var fullArguments = [attemts_left, promiseFunction].concat(promiseFunctionArguments);
--- a/bin/templates/cordova/lib/run.js
+++ b/bin/templates/cordova/lib/run.js
@@ -25,63 +25,36 @@ var path  = require('path'),
    build = require('./build'),
    emulator = require('./emulator'),
    device   = require('./device'),
-    shell = require('shelljs'),
-    Q = require('q');
+    Q = require('q'),
+    events = require('cordova-common').events;

-/*
- * Runs the application on a device if available.
- * If no device is found, it will use a started emulator.
- * If no started emulators are found it will attempt to start an avd.
- * If no avds are found it will error out.
- * Returns a promise.
- */
- module.exports.run = function(args) {
-    var buildFlags = [];
+function getInstallTarget(runOptions) {
    var install_target;
-    var list = false;
-
-    for (var i=2; i<args.length; i++) {
-        if (build.isBuildFlag(args[i])) {
-            buildFlags.push(args[i]);
-        } else if (args[i] == '--device') {
-            install_target = '--device';
-        } else if (args[i] == '--emulator') {
-            install_target = '--emulator';
-        } else if (/^--target=/.exec(args[i])) {
-            install_target = args[i].substring(9, args[i].length);
-        } else if (args[i] == '--list') {
-            list = true;
-        } else {
-            console.warn('Option \'' + args[i] + '\' not recognized (ignoring).');
-        }
+    if (runOptions.target) {
+        install_target = runOptions.target;
+    } else if (runOptions.device) {
+        install_target = '--device';
+    } else if (runOptions.emulator) {
+        install_target = '--emulator';
    }

-    if (list) {
-        var output = '';
-        var temp = '';
-        if (!install_target) {
-            output += 'Available Android Devices:\n';
-            temp = shell.exec(path.join(__dirname, 'list-devices'), {silent:true}).output;
-            temp = temp.replace(/^(?=[^\s])/gm, '\t');
-            output += temp;
-            output += 'Available Android Virtual Devices:\n';
-            temp = shell.exec(path.join(__dirname, 'list-emulator-images'), {silent:true}).output;
-            temp = temp.replace(/^(?=[^\s])/gm, '\t');
-            output += temp;
-        } else if (install_target == '--emulator') {
-            output += 'Available Android Virtual Devices:\n';
-            temp = shell.exec(path.join(__dirname, 'list-emulator-images'), {silent:true}).output;
-            temp = temp.replace(/^(?=[^\s])/gm, '\t');
-            output += temp;
-        } else if (install_target == '--device') {
-            output += 'Available Android Devices:\n';
-            temp = shell.exec(path.join(__dirname, 'list-devices'), {silent:true}).output;
-            temp = temp.replace(/^(?=[^\s])/gm, '\t');
-            output += temp;
-        }
-        console.log(output);
-        return;
-    }
+    return install_target;
+}
+
+/**
+ * Runs the application on a device if available. If no device is found, it will
+ *   use a started emulator. If no started emulators are found it will attempt
+ *   to start an avd. If no avds are found it will error out.
+ *
+ * @param   {Object}  runOptions  various run/build options. See Api.js build/run
+ *   methods for reference.
+ *
+ * @return  {Promise}
+ */
+ module.exports.run = function(runOptions) {
+
+    var self = this;
+    var install_target = getInstallTarget(runOptions);

    return Q()
    .then(function() {
@@ -90,10 +63,10 @@ var path  = require('path'),
            return device.list()
            .then(function(device_list) {
                if (device_list.length > 0) {
-                    console.log('WARNING : No target specified, deploying to device \'' + device_list[0] + '\'.');
+                    events.emit('warn', 'No target specified, deploying to device \'' + device_list[0] + '\'.');
                    install_target = device_list[0];
                } else {
-                    console.log('WARNING : No target specified, deploying to emulator');
+                    events.emit('warn', 'No target specified and no devices found, deploying to emulator');
                    install_target = '--emulator';
                }
            });
@@ -137,17 +110,25 @@ var path  = require('path'),
            });
        });
    }).then(function(resolvedTarget) {
-        return build.run(buildFlags, resolvedTarget).then(function(buildResults) {
+        // Better just call self.build, but we're doing some processing of
+        // build results (according to platformApi spec) so they are in different
+        // format than emulator.install expects.
+        // TODO: Update emulator/device.install to handle this change
+        return build.run.call(self, runOptions, resolvedTarget)
+        .then(function(buildResults) {
            if (resolvedTarget.isEmulator) {
-                return emulator.install(resolvedTarget, buildResults);
+                return emulator.wait_for_boot(resolvedTarget.target)
+                .then(function () {
+                    return emulator.install(resolvedTarget, buildResults);
+                });
            }
            return device.install(resolvedTarget, buildResults);
        });
    });
 };

-module.exports.help = function(args) {
-    console.log('Usage: ' + path.relative(process.cwd(), args[1]) + ' [options]');
+module.exports.help = function() {
+    console.log('Usage: ' + path.relative(process.cwd(), process.argv[1]) + ' [options]');
    console.log('Build options :');
    console.log('    --debug : Builds project in debug mode');
    console.log('    --release : Builds project in release mode');
--- a/bin/templates/cordova/lib/spawn.js
+++ b/bin/templates/cordova/lib/spawn.js
@@ -1,50 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var child_process = require('child_process'),
-    Q       = require('q');
-var isWindows = process.platform.slice(0, 3) == 'win';
-
-// Takes a command and optional current working directory.
-module.exports = function(cmd, args, opt_cwd) {
-    var d = Q.defer();
-    var opts = { cwd: opt_cwd, stdio: 'inherit' };
-    try {
-        // Work around spawn not being able to find .bat files.
-        if (isWindows) {
-            args = [['/s', '/c', '"' + [cmd].concat(args).map(function(a){if (/^[^"].* .*[^"]/.test(a)) return '"' + a + '"'; return a;}).join(' ')+'"'].join(' ')];
-            cmd = 'cmd';
-            opts.windowsVerbatimArguments = true;
-        }
-        var child = child_process.spawn(cmd, args, opts);
-        child.on('exit', function(code) {
-            if (code) {
-                d.reject('Error code ' + code + ' for command: ' + cmd + ' with args: ' + args);
-            } else {
-                d.resolve();
-            }
-        });
-    } catch(e) {
-        console.error('error caught: ' + e);
-        d.reject(e);
-    }
-    return d.promise;
-};
--- a/bin/templates/cordova/loggingHelper.js
+++ b/bin/templates/cordova/loggingHelper.js
@@ -0,0 +1,18 @@
+var CordovaLogger = require('cordova-common').CordovaLogger;
+
+module.exports = {
+    adjustLoggerLevel: function (opts) {
+        if (opts instanceof Array) {
+            opts.silent = opts.indexOf('--silent') !== -1;
+            opts.verbose = opts.indexOf('--verbose') !== -1;
+        }
+
+        if (opts.silent) {
+            CordovaLogger.get().setLevel('error');
+        }
+
+        if (opts.verbose) {
+            CordovaLogger.get().setLevel('verbose');
+        }
+    }
+};
--- a/bin/templates/cordova/run
+++ b/bin/templates/cordova/run
@@ -19,19 +19,35 @@
       under the License.
 */

-var run  = require('./lib/run'),
-    reqs = require('./lib/check_reqs'),
-    args = process.argv;
+var Api = require('./Api');
+var nopt = require('nopt');
+var path = require('path');

 // Support basic help commands
-if (args[2] == '--help' || args[2] == '/?' || args[2] == '-h' ||
-                    args[2] == 'help' || args[2] == '-help' || args[2] == '/help') {
-    run.help(args);
-} else {
-    reqs.run().done(function() {
-        return run.run(args);
-    }, function(err) {
-        console.error('ERROR: ' + err);
-        process.exit(2);
-    });
-}
+if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0)
+    require('./lib/run').help();
+
+// Do some basic argument parsing
+var runOpts = nopt({
+    'verbose' : Boolean,
+    'silent' : Boolean,
+    'debug' : Boolean,
+    'release' : Boolean,
+    'nobuild': Boolean,
+    'buildConfig' : path,
+    'archs' : String,
+    'device' : Boolean,
+    'emulator': Boolean,
+    'target' : String
+}, { 'd' : '--verbose' });
+
+// Make runOptions compatible with PlatformApi run method spec
+runOpts.argv = runOpts.argv.remain;
+
+require('./loggingHelper').adjustLoggerLevel(runOpts);
+
+new Api().run(runOpts)
+.catch(function(err) {
+    console.error(err, err.stack);
+    process.exit(2);
+});
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,10 @@
 */

 // Coho updates this line:
-var VERSION = "4.1.0-dev";
+var VERSION = "5.2.2";

-console.log(VERSION);
+module.exports.version = VERSION;
+
+if (!module.parent) {
+    console.log(VERSION);
+}
--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@ -29,15 +29,13 @@
        />

    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <application android:icon="@drawable/icon" android:label="@string/app_name"
        android:hardwareAccelerated="true" android:supportsRtl="true">
        <activity android:name="__ACTIVITY__"
                android:label="@string/activity_name"
                android:launchMode="singleTop"
-                android:theme="@android:style/Theme.Black.NoTitleBar"
+                android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
                android:windowSoftInputMode="adjustResize"
                android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
            <intent-filter android:label="@string/launcher_name">
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 23738581906992092a43ad2e643b1e0c43bba38a
+// d403ce434788ffe1937711d6ebcbcc837fcbcb14
 /*
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
 under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '4.1.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '5.2.2';
 // file: src/scripts/require.js

 /*jshint -W079 */
@@ -101,7 +101,9 @@ if (typeof module === "object" && typeof require === "function") {
 // file: src/cordova.js
 define("cordova", function(require, exports, module) {

-if(window.cordova){
+// Workaround for Windows 10 in hosted environment case
+// http://www.w3.org/html/wg/drafts/html/master/browsers.html#named-access-on-the-window-object
+if (window.cordova && !(window.cordova instanceof HTMLElement)) {
    throw new Error("cordova already defined");
 }

@@ -328,7 +330,7 @@ module.exports = cordova;

 });

-// file: node_modules/cordova-android/cordova-js-src/android/nativeapiprovider.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
 define("cordova/android/nativeapiprovider", function(require, exports, module) {

 /**
@@ -351,7 +353,7 @@ module.exports = {

 });

-// file: node_modules/cordova-android/cordova-js-src/android/promptbasednativeapi.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
 define("cordova/android/promptbasednativeapi", function(require, exports, module) {

 /**
@@ -376,7 +378,6 @@ module.exports = {
 // file: src/common/argscheck.js
 define("cordova/argscheck", function(require, exports, module) {

-var exec = require('cordova/exec');
 var utils = require('cordova/utils');

 var moduleExports = module.exports;
@@ -861,7 +862,7 @@ module.exports = channel;

 });

-// file: node_modules/cordova-android/cordova-js-src/exec.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/exec.js
 define("cordova/exec", function(require, exports, module) {

 /**
@@ -896,11 +897,7 @@ var cordova = require('cordova'),
        // For the ONLINE_EVENT to be viable, it would need to intercept all event
        // listeners (both through addEventListener and window.ononline) as well
        // as set the navigator property itself.
-        ONLINE_EVENT: 2,
-        // Uses reflection to access private APIs of the WebView that can send JS
-        // to be executed.
-        // Requires Android 3.2.4 or above.
-        PRIVATE_API: 3
+        ONLINE_EVENT: 2
    },
    jsToNativeBridgeMode,  // Set lazily.
    nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT,
@@ -1234,6 +1231,7 @@ if (!window.console.warn) {
 // Register pause, resume and deviceready channels as events on document.
 channel.onPause = cordova.addDocumentEventHandler('pause');
 channel.onResume = cordova.addDocumentEventHandler('resume');
+channel.onActivated = cordova.addDocumentEventHandler('activated');
 channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');

 // Listen for DOMContentLoaded and notify our channel subscribers.
@@ -1295,10 +1293,12 @@ define("cordova/init_b", function(require, exports, module) {

 var channel = require('cordova/channel');
 var cordova = require('cordova');
+var modulemapper = require('cordova/modulemapper');
 var platform = require('cordova/platform');
+var pluginloader = require('cordova/pluginloader');
 var utils = require('cordova/utils');

-var platformInitChannelsArray = [channel.onDOMContentLoaded, channel.onNativeReady];
+var platformInitChannelsArray = [channel.onDOMContentLoaded, channel.onNativeReady, channel.onPluginsReady];

 // setting exec
 cordova.exec = require('cordova/exec');
@@ -1361,6 +1361,7 @@ if (!window.console.warn) {
 // Register pause, resume and deviceready channels as events on document.
 channel.onPause = cordova.addDocumentEventHandler('pause');
 channel.onResume = cordova.addDocumentEventHandler('resume');
+channel.onActivated = cordova.addDocumentEventHandler('activated');
 channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');

 // Listen for DOMContentLoaded and notify our channel subscribers.
@@ -1382,10 +1383,19 @@ if (window._nativeReady) {
 // Call the platform-specific initialization.
 platform.bootstrap && platform.bootstrap();

+// Wrap in a setTimeout to support the use-case of having plugin JS appended to cordova.js.
+// The delay allows the attached modules to be defined before the plugin loader looks for them.
+setTimeout(function() {
+    pluginloader.load(function() {
+        channel.onPluginsReady.fire();
+    });
+}, 0);
+
 /**
 * Create all cordova objects once native side is ready.
 */
 channel.join(function() {
+    modulemapper.mapModules(window);

    platform.initialize && platform.initialize();

@@ -1504,9 +1514,109 @@ exports.reset();

 });

-// file: node_modules/cordova-android/cordova-js-src/platform.js
+// file: src/common/modulemapper_b.js
+define("cordova/modulemapper_b", function(require, exports, module) {
+
+var builder = require('cordova/builder'),
+    symbolList = [],
+    deprecationMap;
+
+exports.reset = function() {
+    symbolList = [];
+    deprecationMap = {};
+};
+
+function addEntry(strategy, moduleName, symbolPath, opt_deprecationMessage) {
+    symbolList.push(strategy, moduleName, symbolPath);
+    if (opt_deprecationMessage) {
+        deprecationMap[symbolPath] = opt_deprecationMessage;
+    }
+}
+
+// Note: Android 2.3 does have Function.bind().
+exports.clobbers = function(moduleName, symbolPath, opt_deprecationMessage) {
+    addEntry('c', moduleName, symbolPath, opt_deprecationMessage);
+};
+
+exports.merges = function(moduleName, symbolPath, opt_deprecationMessage) {
+    addEntry('m', moduleName, symbolPath, opt_deprecationMessage);
+};
+
+exports.defaults = function(moduleName, symbolPath, opt_deprecationMessage) {
+    addEntry('d', moduleName, symbolPath, opt_deprecationMessage);
+};
+
+exports.runs = function(moduleName) {
+    addEntry('r', moduleName, null);
+};
+
+function prepareNamespace(symbolPath, context) {
+    if (!symbolPath) {
+        return context;
+    }
+    var parts = symbolPath.split('.');
+    var cur = context;
+    for (var i = 0, part; part = parts[i]; ++i) {
+        cur = cur[part] = cur[part] || {};
+    }
+    return cur;
+}
+
+exports.mapModules = function(context) {
+    var origSymbols = {};
+    context.CDV_origSymbols = origSymbols;
+    for (var i = 0, len = symbolList.length; i < len; i += 3) {
+        var strategy = symbolList[i];
+        var moduleName = symbolList[i + 1];
+        var module = require(moduleName);
+        // <runs/>
+        if (strategy == 'r') {
+            continue;
+        }
+        var symbolPath = symbolList[i + 2];
+        var lastDot = symbolPath.lastIndexOf('.');
+        var namespace = symbolPath.substr(0, lastDot);
+        var lastName = symbolPath.substr(lastDot + 1);
+
+        var deprecationMsg = symbolPath in deprecationMap ? 'Access made to deprecated symbol: ' + symbolPath + '. ' + deprecationMsg : null;
+        var parentObj = prepareNamespace(namespace, context);
+        var target = parentObj[lastName];
+
+        if (strategy == 'm' && target) {
+            builder.recursiveMerge(target, module);
+        } else if ((strategy == 'd' && !target) || (strategy != 'd')) {
+            if (!(symbolPath in origSymbols)) {
+                origSymbols[symbolPath] = target;
+            }
+            builder.assignOrWrapInDeprecateGetter(parentObj, lastName, module, deprecationMsg);
+        }
+    }
+};
+
+exports.getOriginalSymbol = function(context, symbolPath) {
+    var origSymbols = context.CDV_origSymbols;
+    if (origSymbols && (symbolPath in origSymbols)) {
+        return origSymbols[symbolPath];
+    }
+    var parts = symbolPath.split('.');
+    var obj = context;
+    for (var i = 0; i < parts.length; ++i) {
+        obj = obj && obj[parts[i]];
+    }
+    return obj;
+};
+
+exports.reset();
+
+
+});
+
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js
 define("cordova/platform", function(require, exports, module) {

+// The last resume event that was received that had the result of a plugin call.
+var lastResumeEvent = null;
+
 module.exports = {
    id: 'android',
    bootstrap: function() {
@@ -1546,6 +1656,19 @@ module.exports = {
        bindButtonChannel('volumeup');
        bindButtonChannel('volumedown');

+        // The resume event is not "sticky", but it is possible that the event
+        // will contain the result of a plugin call. We need to ensure that the
+        // plugin result is delivered even after the event is fired (CB-10498)
+        var cordovaAddEventListener = document.addEventListener;
+
+        document.addEventListener = function(evt, handler, capture) {
+            cordovaAddEventListener(evt, handler, capture);
+
+            if (evt === 'resume' && lastResumeEvent) {
+                handler(lastResumeEvent);
+            }
+        };
+
        // Let native code know we are all done on the JS side.
        // Native code will then un-hide the WebView.
        channel.onCordovaReady.subscribe(function() {
@@ -1567,12 +1690,30 @@ function onMessageFromNative(msg) {
        case 'searchbutton':
        // App life cycle events
        case 'pause':
-        case 'resume':
        // Volume events
        case 'volumedownbutton':
        case 'volumeupbutton':
            cordova.fireDocumentEvent(action);
            break;
+        case 'resume':
+            if(arguments.length > 1 && msg.pendingResult) {
+                if(arguments.length === 2) {
+                    msg.pendingResult.result = arguments[1];
+                } else {
+                    // The plugin returned a multipart message
+                    var res = [];
+                    for(var i = 1; i < arguments.length; i++) {
+                        res.push(arguments[i]);
+                    }
+                    msg.pendingResult.result = res;
+                }
+
+                // Save the plugin result so that it can be delivered to the js
+                // even if they miss the initial firing of the event
+                lastResumeEvent = msg;
+            }
+            cordova.fireDocumentEvent(action, msg);
+            break;
        default:
            throw new Error('Unknown event action ' + action);
    }
@@ -1580,7 +1721,7 @@ function onMessageFromNative(msg) {

 });

-// file: node_modules/cordova-android/cordova-js-src/plugin/android/app.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/plugin/android/app.js
 define("cordova/plugin/android/app", function(require, exports, module) {

 var exec = require('cordova/exec');
@@ -1783,6 +1924,54 @@ exports.load = function(callback) {
 };


+});
+
+// file: src/common/pluginloader_b.js
+define("cordova/pluginloader_b", function(require, exports, module) {
+
+var modulemapper = require('cordova/modulemapper');
+
+// Handler for the cordova_plugins.js content.
+// See plugman's plugin_loader.js for the details of this object.
+function handlePluginsObject(moduleList) {
+    // if moduleList is not defined or empty, we've nothing to do
+    if (!moduleList || !moduleList.length) {
+        return;
+    }
+
+    // Loop through all the modules and then through their clobbers and merges.
+    for (var i = 0, module; module = moduleList[i]; i++) {
+        if (module.clobbers && module.clobbers.length) {
+            for (var j = 0; j < module.clobbers.length; j++) {
+                modulemapper.clobbers(module.id, module.clobbers[j]);
+            }
+        }
+
+        if (module.merges && module.merges.length) {
+            for (var k = 0; k < module.merges.length; k++) {
+                modulemapper.merges(module.id, module.merges[k]);
+            }
+        }
+
+        // Finally, if runs is truthy we want to simply require() the module.
+        if (module.runs) {
+            modulemapper.runs(module.id);
+        }
+    }
+}
+
+// Loads all plugins' js-modules. Plugin loading is syncronous in browserified bundle
+// but the method accepts callback to be compatible with non-browserify flow.
+// onDeviceReady is blocked on onPluginsReady. onPluginsReady is fired when there are
+// no plugins to load, or they are all done.
+exports.load = function(callback) {
+    var moduleList = require("cordova/plugin_list");
+    handlePluginsObject(moduleList);
+
+    callback();
+};
+
+
 });

 // file: src/common/urlutil.js
@@ -1864,15 +2053,14 @@ utils.typeName = function(val) {
 /**
 * Returns an indication of whether the argument is an array or not
 */
-utils.isArray = function(a) {
-    return utils.typeName(a) == 'Array';
-};
+utils.isArray = Array.isArray ||
+                function(a) {return utils.typeName(a) == 'Array';};

 /**
 * Returns an indication of whether the argument is a Date or not
 */
 utils.isDate = function(d) {
-    return utils.typeName(d) == 'Date';
+    return (d instanceof Date);
 };

 /**
@@ -1895,7 +2083,7 @@ utils.clone = function(obj) {

    retVal = {};
    for(i in obj){
-        if(!(i in retVal) || retVal[i] != obj[i]) {
+        if((!(i in retVal) || retVal[i] != obj[i]) && typeof obj[i] != 'undefined') {
            retVal[i] = utils.clone(obj[i]);
        }
    }
@@ -1906,17 +2094,25 @@ utils.clone = function(obj) {
 * Returns a wrapped version of the function
 */
 utils.close = function(context, func, params) {
-    if (typeof params == 'undefined') {
-        return function() {
-            return func.apply(context, arguments);
-        };
-    } else {
-        return function() {
-            return func.apply(context, params);
-        };
-    }
+    return function() {
+        var args = params || arguments;
+        return func.apply(context, args);
+    };
 };

+//------------------------------------------------------------------------------
+function UUIDcreatePart(length) {
+    var uuidpart = "";
+    for (var i=0; i<length; i++) {
+        var uuidchar = parseInt((Math.random() * 256), 10).toString(16);
+        if (uuidchar.length == 1) {
+            uuidchar = "0" + uuidchar;
+        }
+        uuidpart += uuidchar;
+    }
+    return uuidpart;
+}
+
 /**
 * Create a UUID
 */
@@ -1928,6 +2124,7 @@ utils.createUUID = function() {
        UUIDcreatePart(6);
 };

+
 /**
 * Extends a child object from a parent object using classical inheritance
 * pattern.
@@ -1937,6 +2134,7 @@ utils.extend = (function() {
    var F = function() {};
    // extend Child from Parent
    return function(Child, Parent) {
+
        F.prototype = Parent.prototype;
        Child.prototype = new F();
        Child.__super__ = Parent.prototype;
@@ -1956,18 +2154,7 @@ utils.alert = function(msg) {
 };


-//------------------------------------------------------------------------------
-function UUIDcreatePart(length) {
-    var uuidpart = "";
-    for (var i=0; i<length; i++) {
-        var uuidchar = parseInt((Math.random() * 256), 10).toString(16);
-        if (uuidchar.length == 1) {
-            uuidchar = "0" + uuidchar;
-        }
-        uuidpart += uuidchar;
-    }
-    return uuidpart;
-}
+


 });
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@@ -19,7 +19,16 @@
 -->
 <html>
    <head>
-        <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: https://ssl.gstatic.com/accessibility/javascript/android/; style-src 'self' 'unsafe-inline'; media-src *">
+        <!--
+        Customize this policy to fit your own app's needs. For more guidance, see:
+            https://github.com/apache/cordova-plugin-whitelist/blob/master/README.md#content-security-policy
+        Some notes:
+            * gap: is required only on iOS (when using UIWebView) and is needed for JS->native communication
+            * https://ssl.gstatic.com is required only on Android and is needed for TalkBack to function properly
+            * Disables use of inline scripts in order to mitigate risk of XSS vulnerabilities. To change this:
+                * Enable inline JS: add 'unsafe-inline' to default-src
+        -->
+        <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *">
        <meta name="format-detection" content="telephone=no">
        <meta name="msapplication-tap-highlight" content="no">
        <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -17,41 +17,33 @@
       under the License.
 */

-// GENERATED FILE! DO NOT EDIT!
-
-apply plugin: 'android'
+apply plugin: 'com.android.application'

 buildscript {
    repositories {
        mavenCentral()
+        jcenter()
    }

    // Switch the Android Gradle plugin version requirement depending on the
    // installed version of Gradle. This dependency is documented at
    // http://tools.android.com/tech-docs/new-build-system/version-compatibility
    // and https://issues.apache.org/jira/browse/CB-8143
-    if (gradle.gradleVersion >= "2.2") {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:1.0.0+'
-        }
-    } else if (gradle.gradleVersion >= "2.1") {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:0.14.0+'
-        }
-    } else {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:0.12.0+'
-        }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.0'
    }
 }

 // Allow plugins to declare Maven dependencies via build-extras.gradle.
-repositories {
-    mavenCentral()
+allprojects {
+    repositories {
+        mavenCentral();
+        jcenter()
+    }
 }

 task wrapper(type: Wrapper) {
-    gradleVersion = '2.2.1'
+    gradleVersion = '2.13'
 }

 // Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties.
@@ -172,25 +164,31 @@ android {
    }

    defaultConfig {
-        versionCode cdvVersionCode ?: Integer.parseInt("" + privateHelpers.extractIntFromManifest("versionCode") + "0")
+        versionCode cdvVersionCode ?: Integer.parseInt("" + privateHelpers.extractIntFromManifest("versionCode"))
+        applicationId privateHelpers.extractStringFromManifest("package")
+
        if (cdvMinSdkVersion != null) {
            minSdkVersion cdvMinSdkVersion
        }
    }

+    lintOptions {
+      abortOnError false;
+    }
+
    compileSdkVersion cdvCompileSdkVersion
    buildToolsVersion cdvBuildToolsVersion

    if (Boolean.valueOf(cdvBuildMultipleApks)) {
        productFlavors {
            armv7 {
-                versionCode cdvVersionCode ?: defaultConfig.versionCode + 2
+                versionCode defaultConfig.versionCode*10 + 2
                ndk {
                    abiFilters "armeabi-v7a", ""
                }
            }
            x86 {
-                versionCode cdvVersionCode ?: defaultConfig.versionCode + 4
+                versionCode defaultConfig.versionCode*10 + 4
                ndk {
                    abiFilters "x86", ""
                }
@@ -201,7 +199,12 @@ android {
                }
            }
        }
-    } else if (!cdvVersionCode) {
+    }
+    /*
+
+    ELSE NOTHING! DON'T MESS WITH THE VERSION CODE IF YOU DON'T HAVE TO!
+
+    else if (!cdvVersionCode) {
      def minSdkVersion = cdvMinSdkVersion ?: privateHelpers.extractIntFromManifest("minSdkVersion")
      // Vary versionCode by the two most common API levels:
      // 14 is ICS, which is the lowest API level for many apps.
@@ -212,6 +215,7 @@ android {
        defaultConfig.versionCode += 8
      }
    }
+    */

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_6
--- a/bin/update
+++ b/bin/update
@@ -19,13 +19,19 @@
       under the License.
 */
 var path   = require('path');
-var create = require('./lib/create');
-var args  = require('./lib/simpleargs').getArgs(process.argv);
+var Api = require('./templates/cordova/Api');
+var args  = require('nopt')({
+    'link': Boolean,
+    'shared': Boolean,
+    'help': Boolean
+}, { 'd' : '--verbose' });

-if (args['--help'] || args._.length === 0) {
+if (args.help || args.argv.remain.length === 0) {
    console.log('Usage: ' + path.relative(process.cwd(), path.join(__dirname, 'update')) + ' <path_to_project> [--link]');
    console.log('    --link will use the CordovaLib project directly instead of making a copy.');
    process.exit(1);
 }
-create.updateProject(args._[0], args['--link'] || args['--shared']).done();

+require('./templates/cordova/loggingHelper').adjustLoggerLevel(args);
+
+Api.updatePlatform(args.argv.remain[0], {link: (args.link || args.shared)}).done();
--- a/cordova-js-src/platform.js
+++ b/cordova-js-src/platform.js
@@ -19,6 +19,9 @@
 *
 */

+// The last resume event that was received that had the result of a plugin call.
+var lastResumeEvent = null;
+
 module.exports = {
    id: 'android',
    bootstrap: function() {
@@ -58,6 +61,19 @@ module.exports = {
        bindButtonChannel('volumeup');
        bindButtonChannel('volumedown');

+        // The resume event is not "sticky", but it is possible that the event
+        // will contain the result of a plugin call. We need to ensure that the
+        // plugin result is delivered even after the event is fired (CB-10498)
+        var cordovaAddEventListener = document.addEventListener;
+
+        document.addEventListener = function(evt, handler, capture) {
+            cordovaAddEventListener(evt, handler, capture);
+
+            if (evt === 'resume' && lastResumeEvent) {
+                handler(lastResumeEvent);
+            }
+        };
+
        // Let native code know we are all done on the JS side.
        // Native code will then un-hide the WebView.
        channel.onCordovaReady.subscribe(function() {
@@ -79,12 +95,30 @@ function onMessageFromNative(msg) {
        case 'searchbutton':
        // App life cycle events
        case 'pause':
-        case 'resume':
        // Volume events
        case 'volumedownbutton':
        case 'volumeupbutton':
            cordova.fireDocumentEvent(action);
            break;
+        case 'resume':
+            if(arguments.length > 1 && msg.pendingResult) {
+                if(arguments.length === 2) {
+                    msg.pendingResult.result = arguments[1];
+                } else {
+                    // The plugin returned a multipart message
+                    var res = [];
+                    for(var i = 1; i < arguments.length; i++) {
+                        res.push(arguments[i]);
+                    }
+                    msg.pendingResult.result = res;
+                }
+
+                // Save the plugin result so that it can be delivered to the js
+                // even if they miss the initial firing of the event
+                lastResumeEvent = msg;
+            }
+            cordova.fireDocumentEvent(action, msg);
+            break;
        default:
            throw new Error('Unknown event action ' + action);
    }
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -23,26 +23,19 @@ buildscript {
        mavenCentral()
    }

-    // Switch the Android Gradle plugin version requirement depending on the
-    // installed version of Gradle. This dependency is documented at
-    // http://tools.android.com/tech-docs/new-build-system/version-compatibility
-    // and https://issues.apache.org/jira/browse/CB-8143
-    if (gradle.gradleVersion >= "2.2") {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:1.0.0+'
-        }
-    } else if (gradle.gradleVersion >= "2.1") {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:0.14.0+'
-        }
-    } else {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:0.12.0+'
-        }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.0'
    }
+
 }

-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
+
+ext {
+    apply from: 'cordova.gradle'
+    cdvCompileSdkVersion = privateHelpers.getProjectTarget()
+    cdvBuildToolsVersion = privateHelpers.findLatestInstalledBuildTools()
+}

 android {
    compileSdkVersion cdvCompileSdkVersion
--- a/framework/cordova.gradle
+++ b/framework/cordova.gradle
@@ -61,7 +61,7 @@ String doFindLatestInstalledBuildTools(String minBuildToolsVersion) {
        highestBuildToolsVersion
    } else {
        throw new RuntimeException(
-            "No installed build tools found. Please install the Android build tools version " +
+            "No installed build tools found. Install the Android build tools version " +
            minBuildToolsVersion + " or higher.")
    }
 }
@@ -128,6 +128,14 @@ def doExtractIntFromManifest(name) {
    return Integer.parseInt(matcher.group(1))
 }

+def doExtractStringFromManifest(name) {
+    def manifestFile = file(android.sourceSets.main.manifest.srcFile)
+    def pattern = Pattern.compile(name + "=\"(\\S+)\"")
+    def matcher = pattern.matcher(manifestFile.getText())
+    matcher.find()
+    return matcher.group(1)
+}
+
 def doPromptForPassword(msg) {
    if (System.console() == null) {
        def ret = null
@@ -179,6 +187,7 @@ ext {
    privateHelpers.getProjectTarget = { doGetProjectTarget() }
    privateHelpers.findLatestInstalledBuildTools = { doFindLatestInstalledBuildTools('19.1.0') }
    privateHelpers.extractIntFromManifest = { name -> doExtractIntFromManifest(name) }
+    privateHelpers.extractStringFromManifest = { name -> doExtractStringFromManifest(name) }
    privateHelpers.promptForPassword = { msg -> doPromptForPassword(msg) }
    privateHelpers.ensureValueExists = { filePath, props, key -> doEnsureValueExists(filePath, props, key) }

--- a/framework/project.properties
+++ b/framework/project.properties
@@ -10,7 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-22
+target=android-23
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true
--- a/framework/src/org/apache/cordova/CallbackContext.java
+++ b/framework/src/org/apache/cordova/CallbackContext.java
@@ -31,7 +31,7 @@ public class CallbackContext {

    private String callbackId;
    private CordovaWebView webView;
-    private boolean finished;
+    protected boolean finished;
    private int changingThreads;

    public CallbackContext(String callbackId, CordovaWebView webView) {
--- a/framework/src/org/apache/cordova/CallbackMap.java
+++ b/framework/src/org/apache/cordova/CallbackMap.java
@@ -0,0 +1,65 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package org.apache.cordova;
+
+import android.util.Pair;
+import android.util.SparseArray;
+
+/**
+ * Provides a collection that maps unique request codes to CordovaPlugins and Integers.
+ * Used to ensure that when plugins make requests for runtime permissions, those requests do not
+ * collide with requests from other plugins that use the same request code value.
+ */
+public class CallbackMap {
+    private int currentCallbackId = 0;
+    private SparseArray<Pair<CordovaPlugin, Integer>> callbacks;
+
+    public CallbackMap() {
+        this.callbacks = new SparseArray<Pair<CordovaPlugin, Integer>>();
+    }
+
+    /**
+     * Stores a CordovaPlugin and request code and returns a new unique request code to use
+     * in a permission request.
+     *
+     * @param receiver      The plugin that is making the request
+     * @param requestCode   The original request code used by the plugin
+     * @return              A unique request code that can be used to retrieve this callback
+     *                      with getAndRemoveCallback()
+     */
+    public synchronized int registerCallback(CordovaPlugin receiver, int requestCode) {
+        int mappedId = this.currentCallbackId++;
+        callbacks.put(mappedId, new Pair<CordovaPlugin, Integer>(receiver, requestCode));
+        return mappedId;
+    }
+
+    /**
+     * Retrieves and removes a callback stored in the map using the mapped request code
+     * obtained from registerCallback()
+     *
+     * @param mappedId      The request code obtained from registerCallback()
+     * @return              The CordovaPlugin and orignal request code that correspond to the
+     *                      given mappedCode
+     */
+    public synchronized Pair<CordovaPlugin, Integer> getAndRemoveCallback(int mappedId) {
+        Pair<CordovaPlugin, Integer> callback = callbacks.get(mappedId);
+        callbacks.remove(mappedId);
+        return callback;
+    }
+}
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -26,6 +26,7 @@ import org.json.JSONObject;

 import android.app.Activity;
 import android.app.AlertDialog;
+import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -108,26 +109,20 @@ public class CordovaActivity extends Activity {

        // need to activate preferences before super.onCreate to avoid "requestFeature() must be called before adding content" exception
        loadConfig();
-        if(!preferences.getBoolean("ShowTitle", false))
-        {
+        if (!preferences.getBoolean("ShowTitle", false)) {
            getWindow().requestFeature(Window.FEATURE_NO_TITLE);
        }

-        if(preferences.getBoolean("SetFullscreen", false))
-        {
+        if (preferences.getBoolean("SetFullscreen", false)) {
            Log.d(TAG, "The SetFullscreen configuration is deprecated in favor of Fullscreen, and will be removed in a future version.");
            preferences.set("Fullscreen", true);
        }
-        if(preferences.getBoolean("Fullscreen", false))
-        {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-            {
+        if (preferences.getBoolean("Fullscreen", false)) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
                immersiveMode = true;
-            }
-            else
-            {
+            } else {
                getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                        WindowManager.LayoutParams.FLAG_FULLSCREEN);
            }
        } else {
            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
@@ -137,12 +132,11 @@ public class CordovaActivity extends Activity {
        super.onCreate(savedInstanceState);

        cordovaInterface = makeCordovaInterface();
-        if(savedInstanceState != null)
-        {
+        if (savedInstanceState != null) {
            cordovaInterface.restoreInstanceState(savedInstanceState);
        }
    }
-    
+
    protected void init() {
        appView = makeWebView();
        createViews();
@@ -191,7 +185,7 @@ public class CordovaActivity extends Activity {

    /**
     * Construct the default web view object.
-     *
+     * <p/>
     * Override this to customize the webview that is used.
     */
    protected CordovaWebView makeWebView() {
@@ -244,13 +238,13 @@ public class CordovaActivity extends Activity {

    /**
     * Called when the activity receives a new intent
-     **/
+     */
    @Override
    protected void onNewIntent(Intent intent) {
        super.onNewIntent(intent);
        //Forward to plugins
        if (this.appView != null)
-           this.appView.onNewIntent(intent);
+            this.appView.onNewIntent(intent);
    }

    /**
@@ -260,7 +254,7 @@ public class CordovaActivity extends Activity {
    protected void onResume() {
        super.onResume();
        LOG.d(TAG, "Resumed the activity.");
-        
+
        if (this.appView == null) {
            return;
        }
@@ -320,16 +314,17 @@ public class CordovaActivity extends Activity {
        super.onWindowFocusChanged(hasFocus);
        if (hasFocus && immersiveMode) {
            final int uiOptions = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;

            getWindow().getDecorView().setSystemUiVisibility(uiOptions);
        }
    }

+    @SuppressLint("NewApi")
    @Override
    public void startActivityForResult(Intent intent, int requestCode, Bundle options) {
        // Capture requestCode here so that it is captured in the setActivityResultCallback() case.
@@ -341,10 +336,10 @@ public class CordovaActivity extends Activity {
     * Called when an activity you launched exits, giving you the requestCode you started it with,
     * the resultCode it returned, and any additional data from it.
     *
-     * @param requestCode       The request code originally supplied to startActivityForResult(),
-     *                          allowing you to identify who this result came from.
-     * @param resultCode        The integer result code returned by the child activity through its setResult().
-     * @param intent            An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
+     * @param requestCode The request code originally supplied to startActivityForResult(),
+     *                    allowing you to identify who this result came from.
+     * @param resultCode  The integer result code returned by the child activity through its setResult().
+     * @param intent      An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
     */
    @Override
    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
@@ -357,9 +352,9 @@ public class CordovaActivity extends Activity {
     * Report an error to the host application. These errors are unrecoverable (i.e. the main resource is unavailable).
     * The errorCode parameter corresponds to one of the ERROR_* constants.
     *
-     * @param errorCode    The error code corresponding to an ERROR_* value.
-     * @param description  A String describing the error.
-     * @param failingUrl   The url that failed to load.
+     * @param errorCode   The error code corresponding to an ERROR_* value.
+     * @param description A String describing the error.
+     * @param failingUrl  The url that failed to load.
     */
    public void onReceivedError(final int errorCode, final String description, final String failingUrl) {
        final CordovaActivity me = this;
@@ -448,9 +443,9 @@ public class CordovaActivity extends Activity {
    /**
     * Called when a message is sent to plugin.
     *
-     * @param id            The message id
-     * @param data          The message data
-     * @return              Object or null
+     * @param id   The message id
+     * @param data The message data
+     * @return Object or null
     */
    public Object onMessage(String id, Object data) {
        if ("onReceivedError".equals(id)) {
@@ -466,8 +461,7 @@ public class CordovaActivity extends Activity {
        return null;
    }

-    protected void onSaveInstanceState(Bundle outState)
-    {
+    protected void onSaveInstanceState(Bundle outState) {
        cordovaInterface.onSaveInstanceState(outState);
        super.onSaveInstanceState(outState);
    }
@@ -475,7 +469,7 @@ public class CordovaActivity extends Activity {
    /**
     * Called by the system when the device configuration changes while your activity is running.
     *
-     * @param newConfig		The new device configuration
+     * @param newConfig The new device configuration
     */
    @Override
    public void onConfigurationChanged(Configuration newConfig) {
@@ -488,4 +482,27 @@ public class CordovaActivity extends Activity {
            pm.onConfigurationChanged(newConfig);
        }
    }
+
+    /**
+     * Called by the system when the user grants permissions
+     *
+     * @param requestCode
+     * @param permissions
+     * @param grantResults
+     */
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String permissions[],
+                                           int[] grantResults) {
+        try
+        {
+            cordovaInterface.onRequestPermissionResult(requestCode, permissions, grantResults);
+        }
+        catch (JSONException e)
+        {
+            LOG.d(TAG, "JSONException: Parameters fed into the method are not valid");
+            e.printStackTrace();
+        }
+
+    }
+
 }
--- a/framework/src/org/apache/cordova/CordovaInterface.java
+++ b/framework/src/org/apache/cordova/CordovaInterface.java
@@ -69,4 +69,20 @@ public interface CordovaInterface {
     * Returns a shared thread pool that can be used for background tasks.
     */
    public ExecutorService getThreadPool();
+
+    /**
+     * Sends a permission request to the activity for one permission.
+     */
+    public void requestPermission(CordovaPlugin plugin, int requestCode, String permission);
+
+    /**
+     * Sends a permission request to the activity for a group of permissions
+     */
+    public void requestPermissions(CordovaPlugin plugin, int requestCode, String [] permissions);
+
+    /**
+     * Check for a permission.  Returns true if the permission is granted, false otherwise.
+     */
+    public boolean hasPermission(String permission);
+
 }
--- a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
+++ b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
@@ -21,8 +21,14 @@ package org.apache.cordova;

 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.util.Pair;
+
+import org.json.JSONException;
+import org.json.JSONObject;

 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -37,9 +43,12 @@ public class CordovaInterfaceImpl implements CordovaInterface {
    protected PluginManager pluginManager;

    protected ActivityResultHolder savedResult;
+    protected CallbackMap permissionResultCallbacks;
    protected CordovaPlugin activityResultCallback;
    protected String initCallbackService;
    protected int activityResultRequestCode;
+    protected boolean activityWasDestroyed = false;
+    protected Bundle savedPluginState;

    public CordovaInterfaceImpl(Activity activity) {
        this(activity, Executors.newCachedThreadPool());
@@ -48,6 +57,7 @@ public class CordovaInterfaceImpl implements CordovaInterface {
    public CordovaInterfaceImpl(Activity activity, ExecutorService threadPool) {
        this.activity = activity;
        this.threadPool = threadPool;
+        this.permissionResultCallbacks = new CallbackMap();
    }

    @Override
@@ -89,12 +99,31 @@ public class CordovaInterfaceImpl implements CordovaInterface {
    }

    /**
-     * Dispatches any pending onActivityResult callbacks.
+     * Dispatches any pending onActivityResult callbacks and sends the resume event if the
+     * Activity was destroyed by the OS.
     */
    public void onCordovaInit(PluginManager pluginManager) {
        this.pluginManager = pluginManager;
        if (savedResult != null) {
            onActivityResult(savedResult.requestCode, savedResult.resultCode, savedResult.intent);
+        } else if(activityWasDestroyed) {
+            // If there was no Activity result, we still need to send out the resume event if the
+            // Activity was destroyed by the OS
+            activityWasDestroyed = false;
+            if(pluginManager != null)
+            {
+                CoreAndroid appPlugin = (CoreAndroid) pluginManager.getPlugin(CoreAndroid.PLUGIN_NAME);
+                if(appPlugin != null) {
+                    JSONObject obj = new JSONObject();
+                    try {
+                        obj.put("action", "resume");
+                    } catch (JSONException e) {
+                        LOG.e(TAG, "Failed to create event message", e);
+                    }
+                    appPlugin.sendResumeEvent(new PluginResult(PluginResult.Status.OK, obj));
+                }
+            }
+
        }
    }

@@ -109,6 +138,10 @@ public class CordovaInterfaceImpl implements CordovaInterface {
            savedResult = new ActivityResultHolder(requestCode, resultCode, intent);
            if (pluginManager != null) {
                callback = pluginManager.getPlugin(initCallbackService);
+                if(callback != null) {
+                    callback.onRestoreStateForActivityResult(savedPluginState.getBundle(callback.getServiceName()),
+                            new ResumeCallback(callback.getServiceName(), pluginManager));
+                }
            }
        }
        activityResultCallback = null;
@@ -120,7 +153,7 @@ public class CordovaInterfaceImpl implements CordovaInterface {
            callback.onActivityResult(requestCode, resultCode, intent);
            return true;
        }
-        Log.w(TAG, "Got an activity result, but no plugin was registered to receive it" + (savedResult != null ? " yet!": "."));
+        Log.w(TAG, "Got an activity result, but no plugin was registered to receive it" + (savedResult != null ? " yet!" : "."));
        return false;
    }

@@ -141,6 +174,10 @@ public class CordovaInterfaceImpl implements CordovaInterface {
            String serviceName = activityResultCallback.getServiceName();
            outState.putString("callbackService", serviceName);
        }
+        if(pluginManager != null){
+            outState.putBundle("plugin", pluginManager.onSaveInstanceState());
+        }
+
    }

    /**
@@ -148,6 +185,8 @@ public class CordovaInterfaceImpl implements CordovaInterface {
     */
    public void restoreInstanceState(Bundle savedInstanceState) {
        initCallbackService = savedInstanceState.getString("callbackService");
+        savedPluginState = savedInstanceState.getBundle("plugin");
+        activityWasDestroyed = true;
    }

    private static class ActivityResultHolder {
@@ -161,4 +200,43 @@ public class CordovaInterfaceImpl implements CordovaInterface {
            this.intent = intent;
        }
    }
+
+    /**
+     * Called by the system when the user grants permissions
+     *
+     * @param requestCode
+     * @param permissions
+     * @param grantResults
+     */
+    public void onRequestPermissionResult(int requestCode, String[] permissions,
+                                          int[] grantResults) throws JSONException {
+        Pair<CordovaPlugin, Integer> callback = permissionResultCallbacks.getAndRemoveCallback(requestCode);
+        if(callback != null) {
+            callback.first.onRequestPermissionResult(callback.second, permissions, grantResults);
+        }
+    }
+
+    public void requestPermission(CordovaPlugin plugin, int requestCode, String permission) {
+        String[] permissions = new String [1];
+        permissions[0] = permission;
+        requestPermissions(plugin, requestCode, permissions);
+    }
+
+    public void requestPermissions(CordovaPlugin plugin, int requestCode, String [] permissions) {
+        int mappedRequestCode = permissionResultCallbacks.registerCallback(plugin, requestCode);
+        getActivity().requestPermissions(permissions, mappedRequestCode);
+    }
+
+    public boolean hasPermission(String permission)
+    {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+        {
+            int result = activity.checkSelfPermission(permission);
+            return PackageManager.PERMISSION_GRANTED == result;
+        }
+        else
+        {
+            return true;
+        }
+    }
 }
--- a/framework/src/org/apache/cordova/CordovaPlugin.java
+++ b/framework/src/org/apache/cordova/CordovaPlugin.java
@@ -26,8 +26,11 @@ import org.json.JSONArray;
 import org.json.JSONException;

 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;

 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -75,7 +78,7 @@ public class CordovaPlugin {
    public String getServiceName() {
        return serviceName;
    }
-    
+
    /**
     * Executes the request.
     *
@@ -172,6 +175,29 @@ public class CordovaPlugin {
    public void onDestroy() {
    }

+    /**
+     * Called when the Activity is being destroyed (e.g. if a plugin calls out to an external
+     * Activity and the OS kills the CordovaActivity in the background). The plugin should save its
+     * state in this method only if it is awaiting the result of an external Activity and needs
+     * to preserve some information so as to handle that result; onRestoreStateForActivityResult()
+     * will only be called if the plugin is the recipient of an Activity result
+     *
+     * @return  Bundle containing the state of the plugin or null if state does not need to be saved
+     */
+    public Bundle onSaveInstanceState() {
+        return null;
+    }
+
+    /**
+     * Called when a plugin is the recipient of an Activity result after the CordovaActivity has
+     * been destroyed. The Bundle will be the same as the one the plugin returned in
+     * onSaveInstanceState()
+     *
+     * @param state             Bundle containing the state of the plugin
+     * @param callbackContext   Replacement Context to return the plugin result to
+     */
+    public void onRestoreStateForActivityResult(Bundle state, CallbackContext callbackContext) {}
+
    /**
     * Called when a message is sent to plugin.
     *
@@ -321,7 +347,7 @@ public class CordovaPlugin {
     */
    public void onReset() {
    }
-    
+
    /**
     * Called when the system received an HTTP authentication request. Plugin can use
     * the supplied HttpAuthHandler to process this auth challenge.
@@ -330,14 +356,14 @@ public class CordovaPlugin {
     * @param handler           The HttpAuthHandler used to set the WebView's response
     * @param host              The host requiring authentication
     * @param realm             The realm for which authentication is required
-     * 
+     *
     * @return                  Returns True if plugin will resolve this auth challenge, otherwise False
-     * 
+     *
     */
    public boolean onReceivedHttpAuthRequest(CordovaWebView view, ICordovaHttpAuthHandler handler, String host, String realm) {
        return false;
    }
-    
+
    /**
     * Called when he system received an SSL client certificate request.  Plugin can use
     * the supplied ClientCertRequest to process this certificate challenge.
@@ -359,4 +385,38 @@ public class CordovaPlugin {
     */
    public void onConfigurationChanged(Configuration newConfig) {
    }
+
+    /**
+     * Called by the Plugin Manager when we need to actually request permissions
+     *
+     * @param requestCode   Passed to the activity to track the request
+     *
+     * @return              Returns the permission that was stored in the plugin
+     */
+
+    public void requestPermissions(int requestCode) {
+    }
+
+    /*
+     * Called by the WebView implementation to check for geolocation permissions, can be used
+     * by other Java methods in the event that a plugin is using this as a dependency.
+     *
+     * @return          Returns true if the plugin has all the permissions it needs to operate.
+     */
+
+    public boolean hasPermisssion() {
+        return true;
+    }
+
+    /**
+     * Called by the system when the user grants permissions
+     *
+     * @param requestCode
+     * @param permissions
+     * @param grantResults
+     */
+    public void onRequestPermissionResult(int requestCode, String[] permissions,
+                                          int[] grantResults) throws JSONException {
+
+    }
 }
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
 * are not expected to implement it.
 */
 public interface CordovaWebView {
-    public static final String CORDOVA_VERSION = "4.1.0-dev";
+    public static final String CORDOVA_VERSION = "5.2.2";

    void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);

--- a/framework/src/org/apache/cordova/CordovaWebViewEngine.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewEngine.java
@@ -22,7 +22,7 @@ import android.view.KeyEvent;
 import android.view.View;

 /**
- * Interfcae for all Cordova engines.
+ * Interface for all Cordova engines.
 * No methods will be added to this class (in order to be compatible with existing engines).
 * Instead, we will create a new interface: e.g. CordovaWebViewEngineV2
 */
--- a/framework/src/org/apache/cordova/CordovaWebViewImpl.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewImpl.java
@@ -135,6 +135,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
        if (recreatePlugins) {
            // Don't re-initialize on first load.
            if (loadedUrl != null) {
+                appPlugin = null;
                pluginManager.init();
            }
            loadedUrl = url;
@@ -354,6 +355,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
            case KeyEvent.KEYCODE_VOLUME_DOWN:
            case KeyEvent.KEYCODE_VOLUME_UP:
            case KeyEvent.KEYCODE_BACK:
+            case KeyEvent.KEYCODE_MENU:
                // TODO: Why are search and menu buttons handled separately?
                if (override) {
                    boundKeyCodes.add(keyCode);
@@ -445,7 +447,10 @@ public class CordovaWebViewImpl implements CordovaWebView {
        // Resume JavaScript timers. This affects all webviews within the app!
        engine.setPaused(false);
        this.pluginManager.onResume(keepRunning);
-        // To be the same as other platforms, fire this event only when resumed after a "pause".
+
+        // In order to match the behavior of the other platforms, we only send onResume after an
+        // onPause has occurred. The resume event might still be sent if the Activity was killed
+        // while waiting for the result of an external Activity once the result is obtained
        if (hasPausedEver) {
            sendJavascriptEvent("resume");
        }
--- a/framework/src/org/apache/cordova/CoreAndroid.java
+++ b/framework/src/org/apache/cordova/CoreAndroid.java
@@ -19,10 +19,6 @@

 package org.apache.cordova;

-import org.apache.cordova.CallbackContext;
-import org.apache.cordova.CordovaPlugin;
-import org.apache.cordova.LOG;
-import org.apache.cordova.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -45,6 +41,8 @@ class CoreAndroid extends CordovaPlugin {
    protected static final String TAG = "CordovaApp";
    private BroadcastReceiver telephonyReceiver;
    private CallbackContext messageChannel;
+    private PluginResult pendingResume;
+    private final Object messageChannelLock = new Object();

    /**
     * Send an event to be fired on the Javascript side.
@@ -112,7 +110,13 @@ class CoreAndroid extends CordovaPlugin {
                this.exitApp();
            }
 			else if (action.equals("messageChannel")) {
-                messageChannel = callbackContext;
+                synchronized(messageChannelLock) {
+                    messageChannel = callbackContext;
+                    if (pendingResume != null) {
+                        sendEventMessage(pendingResume);
+                        pendingResume = null;
+                    }
+                }
                return true;
            }

@@ -248,6 +252,9 @@ class CoreAndroid extends CordovaPlugin {
        else if (button.equals("volumedown")) {
            webView.setButtonPlumbedToJs(KeyEvent.KEYCODE_VOLUME_DOWN, override);
        }
+        else if (button.equals("menubutton")) {
+            webView.setButtonPlumbedToJs(KeyEvent.KEYCODE_MENU, override);
+        }
    }

    /**
@@ -313,10 +320,13 @@ class CoreAndroid extends CordovaPlugin {
        } catch (JSONException e) {
            LOG.e(TAG, "Failed to create event message", e);
        }
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, obj);
-        pluginResult.setKeepCallback(true);
+        sendEventMessage(new PluginResult(PluginResult.Status.OK, obj));
+    }
+
+    private void sendEventMessage(PluginResult payload) {
+        payload.setKeepCallback(true);
        if (messageChannel != null) {
-            messageChannel.sendPluginResult(pluginResult);
+            messageChannel.sendPluginResult(payload);
        }
    }

@@ -328,4 +338,23 @@ class CoreAndroid extends CordovaPlugin {
    {
        webView.getContext().unregisterReceiver(this.telephonyReceiver);
    }
+
+    /**
+     * Used to send the resume event in the case that the Activity is destroyed by the OS
+     *
+     * @param resumeEvent PluginResult containing the payload for the resume event to be fired
+     */
+    public void sendResumeEvent(PluginResult resumeEvent) {
+        // This operation must be synchronized because plugin results that trigger resume
+        // events can be processed asynchronously
+        synchronized(messageChannelLock) {
+            if (messageChannel != null) {
+                sendEventMessage(resumeEvent);
+            } else {
+                // Might get called before the page loads, so we need to store it until the
+                // messageChannel gets created
+                this.pendingResume = resumeEvent;
+            }
+        }
+    }
 }
--- a/framework/src/org/apache/cordova/PluginManager.java
+++ b/framework/src/org/apache/cordova/PluginManager.java
@@ -26,6 +26,7 @@ import org.json.JSONException;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.Debug;
 import android.util.Log;

@@ -47,6 +48,8 @@ public class PluginManager {
    private final CordovaWebView app;
    private boolean isInitialized;

+    private CordovaPlugin permissionRequester;
+
    public PluginManager(CordovaWebView cordovaWebView, CordovaInterface cordova, Collection<PluginEntry> pluginEntries) {
        this.ctx = cordova;
        this.app = cordovaWebView;
@@ -508,4 +511,17 @@ public class PluginManager {
            }
        }
    }
+
+    public Bundle onSaveInstanceState() {
+        Bundle state = new Bundle();
+        for (CordovaPlugin plugin : this.pluginMap.values()) {
+            if (plugin != null) {
+                Bundle pluginState = plugin.onSaveInstanceState();
+                if(pluginState != null) {
+                    state.putBundle(plugin.getServiceName(), pluginState);
+                }
+            }
+        }
+        return state;
+    }
 }
--- a/framework/src/org/apache/cordova/ResumeCallback.java
+++ b/framework/src/org/apache/cordova/ResumeCallback.java
@@ -0,0 +1,76 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package org.apache.cordova;
+
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ResumeCallback extends CallbackContext {
+    private final String TAG = "CordovaResumeCallback";
+    private String serviceName;
+    private PluginManager pluginManager;
+
+    public ResumeCallback(String serviceName, PluginManager pluginManager) {
+        super("resumecallback", null);
+        this.serviceName = serviceName;
+        this.pluginManager = pluginManager;
+    }
+
+    @Override
+    public void sendPluginResult(PluginResult pluginResult) {
+        synchronized (this) {
+            if (finished) {
+                LOG.w(TAG, serviceName + " attempted to send a second callback to ResumeCallback\nResult was: " + pluginResult.getMessage());
+                return;
+            } else {
+                finished = true;
+            }
+        }
+
+        JSONObject event = new JSONObject();
+        JSONObject pluginResultObject = new JSONObject();
+
+        try {
+            pluginResultObject.put("pluginServiceName", this.serviceName);
+            pluginResultObject.put("pluginStatus", PluginResult.StatusMessages[pluginResult.getStatus()]);
+
+            event.put("action", "resume");
+            event.put("pendingResult", pluginResultObject);
+        } catch (JSONException e) {
+            LOG.e(TAG, "Unable to create resume object for Activity Result");
+        }
+
+        PluginResult eventResult = new PluginResult(PluginResult.Status.OK, event);
+
+        // We send a list of results to the js so that we don't have to decode
+        // the PluginResult passed to this CallbackContext into JSON twice.
+        // The results are combined into an event payload before the event is
+        // fired on the js side of things (see platform.js)
+        List<PluginResult> result = new ArrayList<PluginResult>();
+        result.add(eventResult);
+        result.add(pluginResult);
+
+        CoreAndroid appPlugin = (CoreAndroid) pluginManager.getPlugin(CoreAndroid.PLUGIN_NAME);
+        appPlugin.sendResumeEvent(new PluginResult(PluginResult.Status.OK, result));
+    }
+}
--- a/framework/src/org/apache/cordova/engine/SystemCookieManager.java
+++ b/framework/src/org/apache/cordova/engine/SystemCookieManager.java
@@ -19,6 +19,7 @@

 package org.apache.cordova.engine;

+import android.annotation.TargetApi;
 import android.os.Build;
 import android.webkit.CookieManager;
 import android.webkit.WebView;
@@ -30,10 +31,15 @@ class SystemCookieManager implements ICordovaCookieManager {
    protected final WebView webView;
    private final CookieManager cookieManager;

+    //Added because lint can't see the conditional RIGHT ABOVE this
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
    public SystemCookieManager(WebView webview) {
        webView = webview;
        cookieManager = CookieManager.getInstance();

+        //REALLY? Nobody has seen this UNTIL NOW?
+        cookieManager.setAcceptFileSchemeCookies(true);
+
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
            cookieManager.setAcceptThirdPartyCookies(webView, true);
        }
--- a/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
@@ -21,6 +21,7 @@ package org.apache.cordova.engine;
 import java.util.Arrays;
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.content.Context;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
@@ -63,13 +64,15 @@ public class SystemWebChromeClient extends WebChromeClient {
    private View mVideoProgressView;
    
    private CordovaDialogsHelper dialogsHelper;
+    private Context appContext;

    private WebChromeClient.CustomViewCallback mCustomViewCallback;
    private View mCustomView;

    public SystemWebChromeClient(SystemWebViewEngine parentEngine) {
        this.parentEngine = parentEngine;
-        dialogsHelper = new CordovaDialogsHelper(parentEngine.webView.getContext());
+        appContext = parentEngine.webView.getContext();
+        dialogsHelper = new CordovaDialogsHelper(appContext);
    }

    /**
@@ -174,12 +177,21 @@ public class SystemWebChromeClient extends WebChromeClient {
    /**
     * Instructs the client to show a prompt to ask the user to set the Geolocation permission state for the specified origin.
     *
+     * This also checks for the Geolocation Plugin and requests permission from the application  to use Geolocation.
+     *
     * @param origin
     * @param callback
     */
    public void onGeolocationPermissionsShowPrompt(String origin, Callback callback) {
        super.onGeolocationPermissionsShowPrompt(origin, callback);
        callback.invoke(origin, true, false);
+        //Get the plugin, it should be loaded
+        CordovaPlugin geolocation = parentEngine.pluginManager.getPlugin("Geolocation");
+        if(geolocation != null && !geolocation.hasPermisssion())
+        {
+            geolocation.requestPermissions(0);
+        }
+
    }
    
    // API level 7 is required for this, see if we could lower this using something else
--- a/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
@@ -135,7 +135,7 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
        return webView;
    }

-    @SuppressLint("SetJavaScriptEnabled")
+    @SuppressLint({"NewApi", "SetJavaScriptEnabled"})
    @SuppressWarnings("deprecation")
    private void initWebViewSettings() {
        webView.setInitialScale(0);
--- a/node_modules/.bin/nopt
+++ b/node_modules/.bin/nopt
@@ -0,0 +1 @@
+../nopt/bin/nopt.js
--- a/node_modules/.bin/semver
+++ b/node_modules/.bin/semver
@@ -0,0 +1 @@
+../semver/bin/semver
--- a/bin/node_modules/.bin/shjs
+++ b/bin/node_modules/.bin/shjs
--- a/node_modules/abbrev/LICENSE
+++ b/node_modules/abbrev/LICENSE
@@ -0,0 +1,15 @@
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/node_modules/abbrev/README.md
+++ b/node_modules/abbrev/README.md
@@ -0,0 +1,23 @@
+# abbrev-js
+
+Just like [ruby's Abbrev](http://apidock.com/ruby/Abbrev).
+
+Usage:
+
+    var abbrev = require("abbrev");
+    abbrev("foo", "fool", "folding", "flop");
+    
+    // returns:
+    { fl: 'flop'
+    , flo: 'flop'
+    , flop: 'flop'
+    , fol: 'folding'
+    , fold: 'folding'
+    , foldi: 'folding'
+    , foldin: 'folding'
+    , folding: 'folding'
+    , foo: 'foo'
+    , fool: 'fool'
+    }
+
+This is handy for command-line scripts, or other cases where you want to be able to accept shorthands.
--- a/bin/node_modules/nopt/node_modules/abbrev/abbrev.js
+++ b/bin/node_modules/nopt/node_modules/abbrev/abbrev.js
--- a/node_modules/abbrev/package.json
+++ b/node_modules/abbrev/package.json
@@ -0,0 +1,90 @@
+{
+  "_args": [
+    [
+      {
+        "raw": "abbrev@1",
+        "scope": null,
+        "escapedName": "abbrev",
+        "name": "abbrev",
+        "rawSpec": "1",
+        "spec": ">=1.0.0 <2.0.0",
+        "type": "range"
+      },
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt"
+    ]
+  ],
+  "_from": "abbrev@>=1.0.0 <2.0.0",
+  "_id": "abbrev@1.0.9",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/abbrev",
+  "_nodeVersion": "4.4.4",
+  "_npmOperationalInternal": {
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/abbrev-1.0.9.tgz_1466016055839_0.7825860097073019"
+  },
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
+  "_npmVersion": "3.9.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "abbrev@1",
+    "scope": null,
+    "escapedName": "abbrev",
+    "name": "abbrev",
+    "rawSpec": "1",
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/nopt"
+  ],
+  "_resolved": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+  "_shasum": "91b4792588a7738c25f35dd6f63752a2f8776135",
+  "_shrinkwrap": null,
+  "_spec": "abbrev@1",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt",
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me"
+  },
+  "bugs": {
+    "url": "https://github.com/isaacs/abbrev-js/issues"
+  },
+  "dependencies": {},
+  "description": "Like ruby's abbrev module, but in js",
+  "devDependencies": {
+    "tap": "^5.7.2"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "91b4792588a7738c25f35dd6f63752a2f8776135",
+    "tarball": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
+  },
+  "files": [
+    "abbrev.js"
+  ],
+  "gitHead": "c386cd9dbb1d8d7581718c54d4ba944cc9298d6f",
+  "homepage": "https://github.com/isaacs/abbrev-js#readme",
+  "license": "ISC",
+  "main": "abbrev.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "i@izs.me"
+    }
+  ],
+  "name": "abbrev",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/isaacs/abbrev-js.git"
+  },
+  "scripts": {
+    "test": "tap test.js --cov"
+  },
+  "version": "1.0.9"
+}
--- a/node_modules/ansi/.jshintrc
+++ b/node_modules/ansi/.jshintrc
@@ -0,0 +1,4 @@
+{
+  "laxcomma": true,
+  "asi": true
+}
--- a/node_modules/ansi/.npmignore
+++ b/node_modules/ansi/.npmignore
@@ -0,0 +1 @@
+node_modules
--- a/node_modules/ansi/History.md
+++ b/node_modules/ansi/History.md
@@ -0,0 +1,23 @@
+
+0.3.1 / 2016-01-14
+==================
+
+  * add MIT LICENSE file (#23, @kasicka)
+  * preserve chaining after redundant style-method calls (#19, @drewblaisdell)
+  * package: add "license" field (#16, @BenjaminTsai)
+
+0.3.0 / 2014-05-09
+==================
+
+  * package: remove "test" script and "devDependencies"
+  * package: remove "engines" section
+  * pacakge: remove "bin" section
+  * package: beautify
+  * examples: remove `starwars` example (#15)
+  * Documented goto, horizontalAbsolute, and eraseLine methods in README.md (#12, @Jammerwoch)
+  * add `.jshintrc` file
+
+< 0.3.0
+=======
+
+  * Prehistoric
--- a/bin/node_modules/which/LICENSE
+++ b/bin/node_modules/which/LICENSE
@@ -1,5 +1,6 @@
-Copyright 2009, 2010, 2011 Isaac Z. Schlueter.
-All rights reserved.
+(The MIT License)
+
+Copyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net>

 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
--- a/node_modules/ansi/README.md
+++ b/node_modules/ansi/README.md
@@ -0,0 +1,98 @@
+ansi.js
+=========
+### Advanced ANSI formatting tool for Node.js
+
+`ansi.js` is a module for Node.js that provides an easy-to-use API for
+writing ANSI escape codes to `Stream` instances. ANSI escape codes are used to do
+fancy things in a terminal window, like render text in colors, delete characters,
+lines, the entire window, or hide and show the cursor, and lots more!
+
+#### Features:
+
+ * 256 color support for the terminal!
+ * Make a beep sound from your terminal!
+ * Works with *any* writable `Stream` instance.
+ * Allows you to move the cursor anywhere on the terminal window.
+ * Allows you to delete existing contents from the terminal window.
+ * Allows you to hide and show the cursor.
+ * Converts CSS color codes and RGB values into ANSI escape codes.
+ * Low-level; you are in control of when escape codes are used, it's not abstracted.
+
+
+Installation
+------------
+
+Install with `npm`:
+
+``` bash
+$ npm install ansi
+```
+
+
+Example
+-------
+
+``` js
+var ansi = require('ansi')
+  , cursor = ansi(process.stdout)
+
+// You can chain your calls forever:
+cursor
+  .red()                 // Set font color to red
+  .bg.grey()             // Set background color to grey
+  .write('Hello World!') // Write 'Hello World!' to stdout
+  .bg.reset()            // Reset the bgcolor before writing the trailing \n,
+                         //      to avoid Terminal glitches
+  .write('\n')           // And a final \n to wrap things up
+
+// Rendering modes are persistent:
+cursor.hex('#660000').bold().underline()
+
+// You can use the regular logging functions, text will be green:
+console.log('This is blood red, bold text')
+
+// To reset just the foreground color:
+cursor.fg.reset()
+
+console.log('This will still be bold')
+
+// to go to a location (x,y) on the console
+// note: 1-indexed, not 0-indexed:
+cursor.goto(10, 5).write('Five down, ten over')
+
+// to clear the current line:
+cursor.horizontalAbsolute(0).eraseLine().write('Starting again')
+
+// to go to a different column on the current line:
+cursor.horizontalAbsolute(5).write('column five')
+
+// Clean up after yourself!
+cursor.reset()
+```
+
+
+License
+-------
+
+(The MIT License)
+
+Copyright (c) 2012 Nathan Rajlich &lt;nathan@tootallnate.net&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/node_modules/ansi/examples/beep/index.js
+++ b/node_modules/ansi/examples/beep/index.js
@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+
+/**
+ * Invokes the terminal "beep" sound once per second on every exact second.
+ */
+
+process.title = 'beep'
+
+var cursor = require('../../')(process.stdout)
+
+function beep () {
+  cursor.beep()
+  setTimeout(beep, 1000 - (new Date()).getMilliseconds())
+}
+
+setTimeout(beep, 1000 - (new Date()).getMilliseconds())
--- a/node_modules/ansi/examples/clear/index.js
+++ b/node_modules/ansi/examples/clear/index.js
@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+
+/**
+ * Like GNU ncurses "clear" command.
+ * https://github.com/mscdex/node-ncurses/blob/master/deps/ncurses/progs/clear.c
+ */
+
+process.title = 'clear'
+
+function lf () { return '\n' }
+
+require('../../')(process.stdout)
+  .write(Array.apply(null, Array(process.stdout.getWindowSize()[1])).map(lf).join(''))
+  .eraseData(2)
+  .goto(1, 1)
--- a/node_modules/ansi/examples/cursorPosition.js
+++ b/node_modules/ansi/examples/cursorPosition.js
@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+var tty = require('tty')
+var cursor = require('../')(process.stdout)
+
+// listen for the queryPosition report on stdin
+process.stdin.resume()
+raw(true)
+
+process.stdin.once('data', function (b) {
+  var match = /\[(\d+)\;(\d+)R$/.exec(b.toString())
+  if (match) {
+    var xy = match.slice(1, 3).reverse().map(Number)
+    console.error(xy)
+  }
+
+  // cleanup and close stdin
+  raw(false)
+  process.stdin.pause()
+})
+
+
+// send the query position request code to stdout
+cursor.queryPosition()
+
+function raw (mode) {
+  if (process.stdin.setRawMode) {
+    process.stdin.setRawMode(mode)
+  } else {
+    tty.setRawMode(mode)
+  }
+}
--- a/node_modules/ansi/examples/progress/index.js
+++ b/node_modules/ansi/examples/progress/index.js
@@ -0,0 +1,87 @@
+#!/usr/bin/env node
+
+var assert = require('assert')
+  , ansi = require('../../')
+
+function Progress (stream, width) {
+  this.cursor = ansi(stream)
+  this.delta = this.cursor.newlines
+  this.width = width | 0 || 10
+  this.open = '['
+  this.close = ']'
+  this.complete = '█'
+  this.incomplete = '_'
+
+  // initial render
+  this.progress = 0
+}
+
+Object.defineProperty(Progress.prototype, 'progress', {
+    get: get
+  , set: set
+  , configurable: true
+  , enumerable: true
+})
+
+function get () {
+  return this._progress
+}
+
+function set (v) {
+  this._progress = Math.max(0, Math.min(v, 100))
+
+  var w = this.width - this.complete.length - this.incomplete.length
+    , n = w * (this._progress / 100) | 0
+    , i = w - n
+    , com = c(this.complete, n)
+    , inc = c(this.incomplete, i)
+    , delta = this.cursor.newlines - this.delta
+
+  assert.equal(com.length + inc.length, w)
+
+  if (delta > 0) {
+    this.cursor.up(delta)
+    this.delta = this.cursor.newlines
+  }
+
+  this.cursor
+    .horizontalAbsolute(0)
+    .eraseLine(2)
+    .fg.white()
+    .write(this.open)
+    .fg.grey()
+    .bold()
+    .write(com)
+    .resetBold()
+    .write(inc)
+    .fg.white()
+    .write(this.close)
+    .fg.reset()
+    .write('\n')
+}
+
+function c (char, length) {
+  return Array.apply(null, Array(length)).map(function () {
+    return char
+  }).join('')
+}
+
+
+
+
+// Usage
+var width = parseInt(process.argv[2], 10) || process.stdout.getWindowSize()[0] / 2
+  , p = new Progress(process.stdout, width)
+
+;(function tick () {
+  p.progress += Math.random() * 5
+  p.cursor
+    .eraseLine(2)
+    .write('Progress: ')
+    .bold().write(p.progress.toFixed(2))
+    .write('%')
+    .resetBold()
+    .write('\n')
+  if (p.progress < 100)
+    setTimeout(tick, 100)
+})()
--- a/node_modules/ansi/lib/ansi.js
+++ b/node_modules/ansi/lib/ansi.js
@@ -0,0 +1,405 @@
+
+/**
+ * References:
+ *
+ *   - http://en.wikipedia.org/wiki/ANSI_escape_code
+ *   - http://www.termsys.demon.co.uk/vtansi.htm
+ *
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var emitNewlineEvents = require('./newlines')
+  , prefix = '\x1b[' // For all escape codes
+  , suffix = 'm'     // Only for color codes
+
+/**
+ * The ANSI escape sequences.
+ */
+
+var codes = {
+    up: 'A'
+  , down: 'B'
+  , forward: 'C'
+  , back: 'D'
+  , nextLine: 'E'
+  , previousLine: 'F'
+  , horizontalAbsolute: 'G'
+  , eraseData: 'J'
+  , eraseLine: 'K'
+  , scrollUp: 'S'
+  , scrollDown: 'T'
+  , savePosition: 's'
+  , restorePosition: 'u'
+  , queryPosition: '6n'
+  , hide: '?25l'
+  , show: '?25h'
+}
+
+/**
+ * Rendering ANSI codes.
+ */
+
+var styles = {
+    bold: 1
+  , italic: 3
+  , underline: 4
+  , inverse: 7
+}
+
+/**
+ * The negating ANSI code for the rendering modes.
+ */
+
+var reset = {
+    bold: 22
+  , italic: 23
+  , underline: 24
+  , inverse: 27
+}
+
+/**
+ * The standard, styleable ANSI colors.
+ */
+
+var colors = {
+    white: 37
+  , black: 30
+  , blue: 34
+  , cyan: 36
+  , green: 32
+  , magenta: 35
+  , red: 31
+  , yellow: 33
+  , grey: 90
+  , brightBlack: 90
+  , brightRed: 91
+  , brightGreen: 92
+  , brightYellow: 93
+  , brightBlue: 94
+  , brightMagenta: 95
+  , brightCyan: 96
+  , brightWhite: 97
+}
+
+
+/**
+ * Creates a Cursor instance based off the given `writable stream` instance.
+ */
+
+function ansi (stream, options) {
+  if (stream._ansicursor) {
+    return stream._ansicursor
+  } else {
+    return stream._ansicursor = new Cursor(stream, options)
+  }
+}
+module.exports = exports = ansi
+
+/**
+ * The `Cursor` class.
+ */
+
+function Cursor (stream, options) {
+  if (!(this instanceof Cursor)) {
+    return new Cursor(stream, options)
+  }
+  if (typeof stream != 'object' || typeof stream.write != 'function') {
+    throw new Error('a valid Stream instance must be passed in')
+  }
+
+  // the stream to use
+  this.stream = stream
+
+  // when 'enabled' is false then all the functions are no-ops except for write()
+  this.enabled = options && options.enabled
+  if (typeof this.enabled === 'undefined') {
+    this.enabled = stream.isTTY
+  }
+  this.enabled = !!this.enabled
+
+  // then `buffering` is true, then `write()` calls are buffered in
+  // memory until `flush()` is invoked
+  this.buffering = !!(options && options.buffering)
+  this._buffer = []
+
+  // controls the foreground and background colors
+  this.fg = this.foreground = new Colorer(this, 0)
+  this.bg = this.background = new Colorer(this, 10)
+
+  // defaults
+  this.Bold = false
+  this.Italic = false
+  this.Underline = false
+  this.Inverse = false
+
+  // keep track of the number of "newlines" that get encountered
+  this.newlines = 0
+  emitNewlineEvents(stream)
+  stream.on('newline', function () {
+    this.newlines++
+  }.bind(this))
+}
+exports.Cursor = Cursor
+
+/**
+ * Helper function that calls `write()` on the underlying Stream.
+ * Returns `this` instead of the write() return value to keep
+ * the chaining going.
+ */
+
+Cursor.prototype.write = function (data) {
+  if (this.buffering) {
+    this._buffer.push(arguments)
+  } else {
+    this.stream.write.apply(this.stream, arguments)
+  }
+  return this
+}
+
+/**
+ * Buffer `write()` calls into memory.
+ *
+ * @api public
+ */
+
+Cursor.prototype.buffer = function () {
+  this.buffering = true
+  return this
+}
+
+/**
+ * Write out the in-memory buffer.
+ *
+ * @api public
+ */
+
+Cursor.prototype.flush = function () {
+  this.buffering = false
+  var str = this._buffer.map(function (args) {
+    if (args.length != 1) throw new Error('unexpected args length! ' + args.length);
+    return args[0];
+  }).join('');
+  this._buffer.splice(0); // empty
+  this.write(str);
+  return this
+}
+
+
+/**
+ * The `Colorer` class manages both the background and foreground colors.
+ */
+
+function Colorer (cursor, base) {
+  this.current = null
+  this.cursor = cursor
+  this.base = base
+}
+exports.Colorer = Colorer
+
+/**
+ * Write an ANSI color code, ensuring that the same code doesn't get rewritten.
+ */
+
+Colorer.prototype._setColorCode = function setColorCode (code) {
+  var c = String(code)
+  if (this.current === c) return
+  this.cursor.enabled && this.cursor.write(prefix + c + suffix)
+  this.current = c
+  return this
+}
+
+
+/**
+ * Set up the positional ANSI codes.
+ */
+
+Object.keys(codes).forEach(function (name) {
+  var code = String(codes[name])
+  Cursor.prototype[name] = function () {
+    var c = code
+    if (arguments.length > 0) {
+      c = toArray(arguments).map(Math.round).join(';') + code
+    }
+    this.enabled && this.write(prefix + c)
+    return this
+  }
+})
+
+/**
+ * Set up the functions for the rendering ANSI codes.
+ */
+
+Object.keys(styles).forEach(function (style) {
+  var name = style[0].toUpperCase() + style.substring(1)
+    , c = styles[style]
+    , r = reset[style]
+
+  Cursor.prototype[style] = function () {
+    if (this[name]) return this
+    this.enabled && this.write(prefix + c + suffix)
+    this[name] = true
+    return this
+  }
+
+  Cursor.prototype['reset' + name] = function () {
+    if (!this[name]) return this
+    this.enabled && this.write(prefix + r + suffix)
+    this[name] = false
+    return this
+  }
+})
+
+/**
+ * Setup the functions for the standard colors.
+ */
+
+Object.keys(colors).forEach(function (color) {
+  var code = colors[color]
+
+  Colorer.prototype[color] = function () {
+    this._setColorCode(this.base + code)
+    return this.cursor
+  }
+
+  Cursor.prototype[color] = function () {
+    return this.foreground[color]()
+  }
+})
+
+/**
+ * Makes a beep sound!
+ */
+
+Cursor.prototype.beep = function () {
+  this.enabled && this.write('\x07')
+  return this
+}
+
+/**
+ * Moves cursor to specific position
+ */
+
+Cursor.prototype.goto = function (x, y) {
+  x = x | 0
+  y = y | 0
+  this.enabled && this.write(prefix + y + ';' + x + 'H')
+  return this
+}
+
+/**
+ * Resets the color.
+ */
+
+Colorer.prototype.reset = function () {
+  this._setColorCode(this.base + 39)
+  return this.cursor
+}
+
+/**
+ * Resets all ANSI formatting on the stream.
+ */
+
+Cursor.prototype.reset = function () {
+  this.enabled && this.write(prefix + '0' + suffix)
+  this.Bold = false
+  this.Italic = false
+  this.Underline = false
+  this.Inverse = false
+  this.foreground.current = null
+  this.background.current = null
+  return this
+}
+
+/**
+ * Sets the foreground color with the given RGB values.
+ * The closest match out of the 216 colors is picked.
+ */
+
+Colorer.prototype.rgb = function (r, g, b) {
+  var base = this.base + 38
+    , code = rgb(r, g, b)
+  this._setColorCode(base + ';5;' + code)
+  return this.cursor
+}
+
+/**
+ * Same as `cursor.fg.rgb(r, g, b)`.
+ */
+
+Cursor.prototype.rgb = function (r, g, b) {
+  return this.foreground.rgb(r, g, b)
+}
+
+/**
+ * Accepts CSS color codes for use with ANSI escape codes.
+ * For example: `#FF000` would be bright red.
+ */
+
+Colorer.prototype.hex = function (color) {
+  return this.rgb.apply(this, hex(color))
+}
+
+/**
+ * Same as `cursor.fg.hex(color)`.
+ */
+
+Cursor.prototype.hex = function (color) {
+  return this.foreground.hex(color)
+}
+
+
+// UTIL FUNCTIONS //
+
+/**
+ * Translates a 255 RGB value to a 0-5 ANSI RGV value,
+ * then returns the single ANSI color code to use.
+ */
+
+function rgb (r, g, b) {
+  var red = r / 255 * 5
+    , green = g / 255 * 5
+    , blue = b / 255 * 5
+  return rgb5(red, green, blue)
+}
+
+/**
+ * Turns rgb 0-5 values into a single ANSI color code to use.
+ */
+
+function rgb5 (r, g, b) {
+  var red = Math.round(r)
+    , green = Math.round(g)
+    , blue = Math.round(b)
+  return 16 + (red*36) + (green*6) + blue
+}
+
+/**
+ * Accepts a hex CSS color code string (# is optional) and
+ * translates it into an Array of 3 RGB 0-255 values, which
+ * can then be used with rgb().
+ */
+
+function hex (color) {
+  var c = color[0] === '#' ? color.substring(1) : color
+    , r = c.substring(0, 2)
+    , g = c.substring(2, 4)
+    , b = c.substring(4, 6)
+  return [parseInt(r, 16), parseInt(g, 16), parseInt(b, 16)]
+}
+
+/**
+ * Turns an array-like object into a real array.
+ */
+
+function toArray (a) {
+  var i = 0
+    , l = a.length
+    , rtn = []
+  for (; i<l; i++) {
+    rtn.push(a[i])
+  }
+  return rtn
+}
--- a/node_modules/ansi/lib/newlines.js
+++ b/node_modules/ansi/lib/newlines.js
@@ -0,0 +1,71 @@
+
+/**
+ * Accepts any node Stream instance and hijacks its "write()" function,
+ * so that it can count any newlines that get written to the output.
+ *
+ * When a '\n' byte is encountered, then a "newline" event will be emitted
+ * on the stream, with no arguments. It is up to the listeners to determine
+ * any necessary deltas required for their use-case.
+ *
+ * Ex:
+ *
+ *   var cursor = ansi(process.stdout)
+ *     , ln = 0
+ *   process.stdout.on('newline', function () {
+ *    ln++
+ *   })
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var assert = require('assert')
+var NEWLINE = '\n'.charCodeAt(0)
+
+function emitNewlineEvents (stream) {
+  if (stream._emittingNewlines) {
+    // already emitting newline events
+    return
+  }
+
+  var write = stream.write
+
+  stream.write = function (data) {
+    // first write the data
+    var rtn = write.apply(stream, arguments)
+
+    if (stream.listeners('newline').length > 0) {
+      var len = data.length
+        , i = 0
+      // now try to calculate any deltas
+      if (typeof data == 'string') {
+        for (; i<len; i++) {
+          processByte(stream, data.charCodeAt(i))
+        }
+      } else {
+        // buffer
+        for (; i<len; i++) {
+          processByte(stream, data[i])
+        }
+      }
+    }
+
+    return rtn
+  }
+
+  stream._emittingNewlines = true
+}
+module.exports = emitNewlineEvents
+
+
+/**
+ * Processes an individual byte being written to a stream
+ */
+
+function processByte (stream, b) {
+  assert.equal(typeof b, 'number')
+  if (b === NEWLINE) {
+    stream.emit('newline')
+  }
+}
--- a/node_modules/ansi/package.json
+++ b/node_modules/ansi/package.json
@@ -0,0 +1,94 @@
+{
+  "_args": [
+    [
+      {
+        "raw": "ansi@^0.3.1",
+        "scope": null,
+        "escapedName": "ansi",
+        "name": "ansi",
+        "rawSpec": "^0.3.1",
+        "spec": ">=0.3.1 <0.4.0",
+        "type": "range"
+      },
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+    ]
+  ],
+  "_from": "ansi@>=0.3.1 <0.4.0",
+  "_id": "ansi@0.3.1",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/ansi",
+  "_nodeVersion": "5.3.0",
+  "_npmUser": {
+    "name": "tootallnate",
+    "email": "nathan@tootallnate.net"
+  },
+  "_npmVersion": "3.3.12",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "ansi@^0.3.1",
+    "scope": null,
+    "escapedName": "ansi",
+    "name": "ansi",
+    "rawSpec": "^0.3.1",
+    "spec": ">=0.3.1 <0.4.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/cordova-common"
+  ],
+  "_resolved": "http://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+  "_shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21",
+  "_shrinkwrap": null,
+  "_spec": "ansi@^0.3.1",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "author": {
+    "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://tootallnate.net"
+  },
+  "bugs": {
+    "url": "https://github.com/TooTallNate/ansi.js/issues"
+  },
+  "dependencies": {},
+  "description": "Advanced ANSI formatting tool for Node.js",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21",
+    "tarball": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
+  },
+  "gitHead": "4d0d4af94e0bdaa648bd7262acd3bde4b98d5246",
+  "homepage": "https://github.com/TooTallNate/ansi.js#readme",
+  "keywords": [
+    "ansi",
+    "formatting",
+    "cursor",
+    "color",
+    "terminal",
+    "rgb",
+    "256",
+    "stream"
+  ],
+  "license": "MIT",
+  "main": "./lib/ansi.js",
+  "maintainers": [
+    {
+      "name": "TooTallNate",
+      "email": "nathan@tootallnate.net"
+    },
+    {
+      "name": "tootallnate",
+      "email": "nathan@tootallnate.net"
+    }
+  ],
+  "name": "ansi",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/ansi.js.git"
+  },
+  "scripts": {},
+  "version": "0.3.1"
+}
--- a/node_modules/balanced-match/.npmignore
+++ b/node_modules/balanced-match/.npmignore
@@ -0,0 +1,5 @@
+test
+.gitignore
+.travis.yml
+Makefile
+example.js
--- a/node_modules/balanced-match/LICENSE.md
+++ b/node_modules/balanced-match/LICENSE.md
@@ -0,0 +1,21 @@
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/node_modules/balanced-match/README.md
+++ b/node_modules/balanced-match/README.md
@@ -0,0 +1,91 @@
+# balanced-match
+
+Match balanced string pairs, like `{` and `}` or `<b>` and `</b>`. Supports regular expressions as well!
+
+[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)
+[![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)
+
+[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/juliangruber/balanced-match)
+
+## Example
+
+Get the first matching pair of braces:
+
+```js
+var balanced = require('balanced-match');
+
+console.log(balanced('{', '}', 'pre{in{nested}}post'));
+console.log(balanced('{', '}', 'pre{first}between{second}post'));
+console.log(balanced(/\s+\{\s+/, /\s+\}\s+/, 'pre  {   in{nest}   }  post'));
+```
+
+The matches are:
+
+```bash
+$ node example.js
+{ start: 3, end: 14, pre: 'pre', body: 'in{nested}', post: 'post' }
+{ start: 3,
+  end: 9,
+  pre: 'pre',
+  body: 'first',
+  post: 'between{second}post' }
+{ start: 3, end: 17, pre: 'pre', body: 'in{nest}', post: 'post' }
+```
+
+## API
+
+### var m = balanced(a, b, str)
+
+For the first non-nested matching pair of `a` and `b` in `str`, return an
+object with those keys:
+
+* **start** the index of the first match of `a`
+* **end** the index of the matching `b`
+* **pre** the preamble, `a` and `b` not included
+* **body** the match, `a` and `b` not included
+* **post** the postscript, `a` and `b` not included
+
+If there's no match, `undefined` will be returned.
+
+If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']` and `{a}}` will match `['', 'a', '}']`.
+
+### var r = balanced.range(a, b, str)
+
+For the first non-nested matching pair of `a` and `b` in `str`, return an
+array with indexes: `[ <a index>, <b index> ]`.
+
+If there's no match, `undefined` will be returned.
+
+If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `[ 1, 3 ]` and `{a}}` will match `[0, 2]`.
+
+## Installation
+
+With [npm](https://npmjs.org) do:
+
+```bash
+npm install balanced-match
+```
+
+## License
+
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Steve Gill	2664180b32	updated bundled cordova-common to 1.4.1	2016-08-17 10:05:02 -07:00
Steve Gill	6c80f58e2a	Set VERSION to 5.2.2 (via coho)	2016-07-26 14:57:28 -07:00
Steve Gill	75663f59aa	Update JS snapshot to version 5.2.2 (via coho)	2016-07-26 14:57:28 -07:00
Steve Gill	15e0b49aae	CB-11626 Updated RELEASENOTES and Version for release 5.2.2	2016-07-26 13:25:19 -07:00
Steve Gill	a5a8868d38	updated cordoova-common to 1.4.0	2016-07-26 13:23:45 -07:00
Joe Bowser	81e5179021	Updaing the gradle for the tests to the latest	2016-07-26 13:21:46 -07:00
Vladimir Kotikov	35dfdece12	CB-11550 Updated RELEASENOTES for release 5.2.1	2016-07-11 13:43:57 +03:00
Vladimir Kotikov	cbed234069	CB-11550 Set VERSION to 5.2.1 (via coho)	2016-07-11 13:43:57 +03:00
Vladimir Kotikov	81b2bccd97	CB-11550 Update JS snapshot to version 5.2.1 (via coho)	2016-07-11 13:43:57 +03:00
Vladimir Kotikov	89a00c02a4	CB-11550 Updated and checked-in node_modules	2016-07-11 13:41:00 +03:00
Alexander Sorokin	40d3cdc0d6	CB-9489 Fixed "endless waiting for emulator" issue	2016-07-11 13:11:04 +03:00
Vivek Kiran	8416c4e5e9	CB-11481: android-library is deprecated use com.android.library instead	2016-07-11 13:11:03 +03:00
Steve Gill	97ce7dd417	Set VERSION to 5.2.0 (via coho)	2016-06-29 12:51:05 -07:00
Steve Gill	b32b8c89c6	Update JS snapshot to version 5.2.0 (via coho)	2016-06-29 12:51:05 -07:00
Steve Gill	fd1d3006c0	CB-11444 Updated RELEASENOTES and Version for release 5.2.0	2016-06-29 12:39:42 -07:00
Joe Bowser	22918152cc	Close #178	2016-06-28 10:49:49 -07:00
Joe Bowser	1fcee242dc	Close #311	2016-06-27 16:00:39 -07:00
Joe Bowser	3f99c15338	Close #290	2016-06-27 15:58:49 -07:00
Joe Bowser	f496f015b6	Close #275	2016-06-27 15:58:27 -07:00
Joe Bowser	5e7e9d5b6c	Close #266	2016-06-27 15:57:47 -07:00
Joe Bowser	8bd4ca49a8	Close #225	2016-06-27 15:54:26 -07:00
Joe Bowser	d33f7e08a8	We already implemented this, Close #222	2016-06-27 15:53:36 -07:00
Joe Bowser	d46ad592b5	Close #196	2016-06-27 15:53:00 -07:00
Joe Bowser	eda765453b	Close #183	2016-06-27 15:50:51 -07:00
Joe Bowser	b295fc6687	Close #181	2016-06-27 15:49:10 -07:00
Joe Bowser	0959608ab9	Close #177	2016-06-27 15:46:23 -07:00
Joe Bowser	6db94dbb9a	Close #172	2016-06-27 15:41:59 -07:00
Joe Bowser	04a3c9d9ee	Adding mavenCentral just in case This closes #309	2016-06-09 10:50:00 -07:00
Joe Bowser	db4d1f5768	CB-11383: Update to gradle for using jcenter and correct Application plugin	2016-06-06 11:21:30 -07:00
Steve Gill	81d6219663	CB-11365 fixed plugin rm issue with emit being undefined	2016-06-02 11:32:21 -07:00
Jason Ginchereau	3a1b4ffcb8	Use platform config.xml for clean This closes #295	2016-05-31 10:27:40 -07:00
Jason Ginchereau	d6fe1a65eb	Bundle updated node modules	2016-05-31 10:27:39 -07:00
Jason Ginchereau	72bbe9fdf0	CB-11117: Use FileUpdater to optimize prepare for android platform	2016-05-31 10:27:37 -07:00
Tony Homer	d125ece9e9	CB-10096: Upgrade test project to Gradle Plugin 2.1.0 This closes #306	2016-05-25 14:49:13 -07:00
Tony Homer	ecb99c963d	CB-11292 fix broken MessageChannel after plugins are recreated This closes #307	2016-05-25 14:49:13 -07:00
Richard Knoll	9738079c42	CB-11259: Improving build output This closes #305	2016-05-17 13:31:12 -07:00
Joe Bowser	e9e27ca47c	CB-10096: Upgrading to Gradle Plugin 2.1.0	2016-05-09 10:59:36 -07:00
Nikhil Khandelwal	5d21fb26e6	CB-11198 Skip android target sdk check. This closes #303 .	2016-05-06 10:44:14 -07:00
Vladimir Kotikov	d351e316bf	CB-11138 Reuse PluginManager from common to add/rm plugins This closes #301	2016-04-29 15:07:05 +03:00
Vladimir Kotikov	dc6384d063	CB-11138 Bump cordova-common to 1.2.0	2016-04-29 15:07:01 +03:00
daserge	914e2fa35f	CB-11163 Android Builds are failing in CI CB-11133 Handle android emulator start failure (reverted from commit `abcaee24f9`)	2016-04-28 17:25:39 +03:00
Nikhil Khandelwal	8b96081579	CB-11153 Move to gradle version 2.13 This closes #299	2016-04-26 14:56:02 -07:00
Nikhil Khandelwal	f3e0623d1d	CB-11153 Use Gradle 2.8 correctly for building Android projects	2016-04-26 14:55:55 -07:00
daserge	abcaee24f9	CB-11133 Handle android emulator start failure	2016-04-26 19:54:34 +03:00
daserge	8951660393	CB-11132 Fix Error: Cannot read property 'match' of undefined in cordova-android emulator.js	2016-04-21 15:40:33 +03:00
Nikhil Khandelwal	e4ecbad3cb	Add simple log for package name being deployed	2016-04-20 09:36:02 -07:00
daserge	40a740b45c	CB-11015 Error adding plugin with gradle extras	2016-04-18 13:20:25 +03:00
Vladimir Kotikov	9af7f506f0	CB-11095 Fix plugin add/removal when running on Node v.010	2016-04-18 12:26:39 +03:00
Vladimir Kotikov	9b8558dbde	CB-11022 Duplicate www files to both destinations on plugin operations This closes #289	2016-04-14 12:03:44 +03:00
daserge	d28ca67edb	CB-10964 Handle build.json file starting with a BOM. This closes #286	2016-04-08 15:32:04 -07:00
Omar Mefire	0deaba0920	Revert "CB-10881: Logging to further investigations" This reverts commit `1b43bc99a1`.	2016-04-06 10:21:40 -07:00
Joe Bowser	bcb10ba6da	Modified build.gradle so that the tests run again	2016-04-04 14:14:57 -07:00
Richard Knoll	ef268e2320	CB-10963: Handle overlapping permission requests from plugins This closes #285	2016-03-29 15:14:41 -07:00
daserge	d9814c5542	CB-8582 Obscure INSTALL_FAILED_VERSION_DOWNGRADE error when installing app	2016-03-28 13:22:22 +03:00
daserge	dd3b9dd01c	CB-10862 Cannot set minsdkversion	2016-03-28 11:35:40 +03:00
Omar Mefire	1b43bc99a1	CB-10881: Logging to further investigations	2016-03-25 08:57:09 -07:00
Joe Bowser	eccde6c0c0	CB-10896: We never enabled cookies on the WebView proper	2016-03-22 12:45:23 -07:00
Vladimir Kotikov	69a2a5b551	CB-10837 Support platform-specific orientation on Android Remove processing of "orientation" preference and let user to specify any platform-specific value for Android This closes #281	2016-03-21 18:30:20 +03:00
daserge	bc9e895e25	CB-10600 'cordova run android --release' does not use signed and zip-aligned version of APK De-prioritize unsigned builds Adds an actionable hint for INSTALL_PARSE_FAILED_NO_CERTIFICATES error Removes filtering by architecture when not specified	2016-03-18 08:59:59 +03:00
Roberto Andrade	457c5b8b3b	CB-9710: Fixing issues parsing `android avd list` output for certain AVDs which resulted in them not being included in the selection process even if they are the best match. This closes 221	2016-03-16 09:32:24 -07:00
Vladimir Kotikov	9f1aedb56d	CB-10888 Enable coverage reports collection via codecov	2016-03-16 17:42:01 +03:00
Vladimir Kotikov	a048aa94ec	CB-10846 Add Travis and AppVeyor badges to readme	2016-03-11 13:35:14 +03:00
Vladimir Kotikov	27d359bd43	CB-10846 Add AppVeyor configuration	2016-03-11 13:03:18 +03:00
Julien Bouquillon	456b4801af	add JIRA issue tracker link. This closes #213	2016-03-11 11:40:00 +03:00
daserge	82582e5a5b	CB-10749 Use cordova-common.CordovaLogger in cordova-android Added -d shorthand to all platform scripts	2016-03-09 18:54:05 +03:00
Byoungro So	18e81c4b90	CB-10673 fixed conflicting plugin install issue with overlapped <source-file> tag. Add --force flag. This closes #264 .	2016-03-07 23:02:19 -08:00
Joe Bowser	bad0034e5d	CB-8976: I wish there was an easier way to test gradle stuff then check it in without having to remember to delete imports This closes #270	2016-03-04 09:53:01 -08:00
Joe Bowser	99d5ff7347	CB-8976: Accidentally left in the crosswalk build from when I was experimenting with this file	2016-03-04 09:53:00 -08:00
Joe Bowser	dc579417fe	CB-8976: Removing the auto-version for non-Crosswalk applications	2016-03-04 09:53:00 -08:00
daserge	fe906dabda	CB-10768 Use cordova-common.superspawn in GradleBuilder	2016-03-03 21:12:28 +03:00
Vladimir Kotikov	8ab75e7109	CB-10729 Move plugin handlers tests for into platform's repo	2016-03-01 11:31:14 +03:00
daserge	aa2b3d3da1	CB-10669 cordova run --list cannot find 'adb'	2016-02-26 13:29:26 +03:00
Byoungro So	0a1b71f125	CB-10660 fixed the exception when removing a non-existing directory. This closes #261	2016-02-26 10:40:33 +03:00
Steve Gill	757a3685f2	Update JS snapshot to version 5.2.0-dev (via coho)	2016-02-24 11:50:08 -08:00
Steve Gill	fd2c3c9857	Set VERSION to 5.2.0-dev (via coho)	2016-02-24 11:50:06 -08:00
Steve Gill	84477ff212	CB-10687 Updated RELEASENOTES and Version for release 5.1.1	2016-02-24 11:49:48 -08:00
Steve Gill	1d7ccaece6	updated cordova-common dependnecy to 1.1.0	2016-02-24 09:50:07 -08:00
daserge	ce2525d4d8	CB-10628 Fix emulate android --target Added a test case	2016-02-18 21:27:40 +03:00
Vladimir Kotikov	7be9e880c2	CB-10618 Handle gradle frameworks on plugin installation/uninstallation This closes #259	2016-02-17 17:56:09 +03:00
riknoll	7233931681	CB-10510: Add an optional timeout to emu start script The script used to wait forever for the emulator to boot. If the emulator got stuck, it would never terminate. This timeout is being added to support cordova-medic and the CI.	2016-02-11 13:37:00 -08:00
riknoll	d7e111fb71	CB-10498: Resume event should be sticky if it has a plugin result	2016-02-03 13:25:56 -08:00
Tony Homer	2ac191fbb8	fix HtmlNotFoundTest so that it passes when file not found is handled correctly This Closes #256	2016-02-01 16:11:17 -05:00
Carlos Santana	088140aca4	CB-10472 NullPointerException: org.apache.cordova.PluginManager.onSaveInstanceState check if pluginManager is null before using it This closes #255	2016-01-29 13:19:00 -05:00
Vladimir Kotikov	e08d0671ab	CB-10138 Adds missing plugin metadata to plugin_list module. This closes #254	2016-01-28 12:45:19 +03:00
Dimitar Kerezov	7669378c6e	CB-10443 Pass original options instead of remaining Nopt parses all options regardless of what is passed as "knownOpts". This leaves the remain property an emtpy array. This ultimately leads to a bug in the parseOpts function where the options undergo a second parsing from nopt. The end result is - this options are not respected at all.. This closes #248	2016-01-28 11:55:29 +03:00
Dimitar Kerezov	1494082a2a	CB-10443 Fix `this.root` null reference parseOpts function referenced this.root but the this object is not the new Api as expected. This leads to an exception upon calling path.relative(this.root, ...).	2016-01-28 11:55:15 +03:00
Vladimir Kotikov	233c2bd882	CB-10421 Fixes exception when calling run script with --help option	2016-01-26 14:56:29 +03:00
Steve Gill	9c4f09a50a	updated .gitignore	2016-01-22 11:59:43 -08:00
Vladimir Kotikov	89d982a8e4	CB-10406 Fixes an exception, thrown when building using Ant. This closes #250	2016-01-22 13:29:50 +03:00
Vladimir Kotikov	9d3ee3d56e	CB-10157 Uninstall app from device/emulator only when signed apk is already installed	2016-01-22 12:36:48 +03:00
Steve Gill	44421bbc79	added missing node_modules	2016-01-20 17:07:49 -08:00
Steve Gill	320558a782	Update JS snapshot to version 5.2.0-dev (via coho)	2016-01-20 16:18:53 -08:00
Steve Gill	9ef7ddbf20	Set VERSION to 5.2.0-dev (via coho)	2016-01-20 16:18:52 -08:00
Steve Gill	603f994f3f	Updated RELEASENOTES and Version for release 5.1.0	2016-01-20 15:49:00 -08:00
Nikhil Khandelwal	ada35e0e00	Fix jshint issues	2016-01-19 12:01:44 -08:00
Nikhil Khandelwal	fc778006ef	CB-10386 Add android.useDeprecatedNdk=true to support NDK in gradle	2016-01-19 11:36:39 -08:00
Joe Bowser	11760afddd	CB-8864: Fixing this to mitigate CB-8685 and CB-10104	2016-01-12 10:39:55 -08:00
Joe Bowser	d78ae309f1	CB-10105: Spot fix for tilde errors on paths.	2016-01-11 15:53:00 -08:00
Darryl Pogue	73fd9e4dfa	Update theme to Theme.DeviceDefault.NoActionBar This uses the device system theme instead of the old Gingerbread-era theme for dialogs and alerts. Available as of API 14, which is now the minSDK version for cordova-android. This closes 245	2016-01-04 12:31:56 -08:00
Darryl Pogue	fb9cf60c41	CB-10014: Set gradle applicationId to package name. This closes 247	2016-01-04 12:18:55 -08:00
Keith Wong	b6a329d479	CB-9949: Fixing menu button event not fired in Android This closes 246	2015-12-16 13:25:19 -08:00
Joe Bowser	70bc7b39b7	CB-9479: Fixing the conditionals again, we should be more vigilant on the gradle versions.	2015-12-07 15:03:02 -08:00
Vladimir Kotikov	03777067cd	CB-10112 Parse additional CLI arguments properly. This closes #241	2015-12-03 13:54:59 +03:00
riknoll	f5271431fb	CB-8917: New Plugin API for passing results on resume after Activity destruction	2015-12-02 09:49:49 -08:00
Vladimir Kotikov	c30eeee5d8	CB-9971 Suppress gradlew _JAVA_OPTIONS output during build	2015-11-20 11:57:18 +03:00
daserge	dac02bef8c	CB-9836 Add .gitattributes to prevent CRLF line endings in repos Normalizes plist line endings to be LF github: close #231	2015-11-12 18:34:41 +03:00
Alexander Sorokin	32edaee3a2	CB-9831 CB-9835 CB-9932 Added e2e tests	2015-11-11 14:06:43 +03:00
Steve Gill	ff1c58def4	added node_modules back into .gitignore	2015-11-02 17:08:55 -08:00
Steve Gill	f9372f5578	checked in missing node_module dependencies that are required	2015-11-02 17:07:12 -08:00
Steve Gill	6afc16c33b	Update JS snapshot to version 5.1.0-dev (via coho)	2015-11-01 23:43:03 -08:00
Steve Gill	74a3d2028f	Set VERSION to 5.1.0-dev (via coho)	2015-11-01 23:43:00 -08:00
Steve Gill	dfe468f335	CB-9922 Updated RELEASENOTES and Version for release 5.0.0	2015-11-01 23:41:46 -08:00
Steve Gill	4f7721b405	updated node_modules	2015-10-30 19:43:08 -07:00
TyIsI	3abd12aee3	Update CordovaWebViewEngine.java Fixed typo. This closes #234	2015-10-30 05:08:18 -07:00
Tim Barham	1c90a77325	CB-9909 Shouldn't escape spaces in paths on Windows.. This closes #237	2015-10-30 04:58:26 -07:00
Steve Gill	671219ae56	CB-9870 updated hello world template	2015-10-29 15:33:43 -07:00
Vladimir Kotikov	78fa7374d9	CB-9880 Fixes platform update failure when upgrading from android@<4.1.0	2015-10-28 12:42:35 +03:00
Vladimir Kotikov	c1b389ad9b	CB-9844 Remove old .java after renaming activity	2015-10-27 11:30:58 +03:00
Joe Bowser	5a07a51b5d	Checked the notice file, updating to 2015	2015-10-26 16:42:06 -07:00
Dmitry Blotsky	824b9803d2	CB-9800 Fixing contribute link.	2015-10-23 15:16:41 -07:00
Vladimir Kotikov	ab72e48431	CB-9782 Check in cordova-common dependency	2015-10-22 22:43:39 +03:00
Vladimir Kotikov	78b7ae72c9	Adds licence header to Adb to pass rat audit	2015-10-22 14:06:20 +03:00
Vladimir Kotikov	1151856d38	CB-9835 Downgrade `properties-parser` to prevent failures in Node < 4.x	2015-10-21 13:24:30 +03:00
Steve Gill	12c282ce5c	reverted fixed line endings in check_reqs.bat	2015-10-20 16:48:59 -07:00
Steve Gill	0ac822c577	Fixed line endings	2015-10-20 16:15:57 -07:00
Vladimir Kotikov	400282282f	CB-9782 Implements PlatformApi contract for Android platform. This closes #226	2015-10-20 12:21:30 +03:00
Alexander Sorokin	789c505a88	CB-9826 Fixed 'test-build' script on windows. This closes #228	2015-10-20 12:02:27 +03:00
fujunwei	0429bb0ab8	The extra digit need to be added to the end of the version code The version code of default config is generated by the environment variable and the value from AndroidManifest.xml. The test case is using the command line "cordova build -- --versionCode=100".. This closes #211	2015-10-19 11:25:33 -07:00
Joe Bowser	000eb0916e	Incrementing Travis to 23	2015-10-19 10:31:56 -07:00
Joe Bowser	4db1fecba8	You can't easily abstract out this variable because this can crash Cordova due to the plugin design.	2015-10-19 10:31:56 -07:00
Joe Bowser	013ad94af0	Refactor of the Cordova Plugin/Permissions API	2015-10-19 10:31:56 -07:00
Joe Bowser	2ceb8030ee	Manually updating version to 5.0.0-dev for engine tags	2015-10-19 10:31:55 -07:00
Joe Bowser	47ac514835	Working on getting the Geolocation Plugin to work by default with the default WebView. Crosswalk will need to make similar modifications.	2015-10-19 10:31:55 -07:00
Joe Bowser	5e0c9595c3	Got the PoC working with the Contacts plugin, going to work through all the plugins	2015-10-19 10:31:55 -07:00
Joe Bowser	a0747aa960	Refactoring based on feedback from Andrew	2015-10-19 10:31:55 -07:00
Joe Bowser	07912fdecd	Bump up to API level 23	2015-10-19 10:31:54 -07:00
Joe Bowser	9a33943783	Finally got it kinda working, Geolocation is not going to work in browser anymore	2015-10-19 10:31:54 -07:00
Joe Bowser	8981ddb681	Commiting code to handle permissions, and the special case of the Geolocation Plugin	2015-10-19 10:31:54 -07:00
daserge	7d61a79a78	CB-9608 cordova-android no longer builds on Node 0.10 or below Replaced path.isAbsolute usage with path.resolve. This closes #217	2015-09-29 09:45:48 +03:00
daserge	afa61aeb09	CB-9080 Cordova CLI run for Android versions 4.1.1 and lower throws error	2015-09-23 18:44:41 +03:00
Vladimir Kotikov	bf57aa1df0	CB-9557 Fixes apk install failure when switching from debug to release build	2015-08-27 09:46:58 +03:00
Tommy-Carlos Williams	055e3bf609	CB-9496 removed permissions added for crosswalk These would better live in the actual crosswalk plugin https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview I have also submit a PR to that repo adding them to its `plugin.xml` github: close #206	2015-08-24 23:17:03 +10:00
Alexander Lebedev	b1dadaf15d	CB-9402 Allow to set gradle distubutionUrl via env variable CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL This closes #205	2015-08-14 11:28:35 -07:00
Joe Bowser	9e400911f5	Make Cordova pass the Lint step	2015-08-10 16:43:41 -07:00
Steve Gill	892b875867	updated release notes	2015-07-31 16:54:52 -07:00
Steve Gill	8f7bc1ffbb	CB-9428 update script now bumps up minSdkVersion to 14 if it is less than that.	2015-07-31 16:32:51 -07:00
Vladimir Kotikov	e5506d40bc	CB-9430 Fixes check_reqs failure when javac returns an extra line	2015-07-31 16:37:21 +03:00
alsorokin	64f89c5eda	CB-9172 Improved emulator deploy stability. This closes #188 . - Use UUID to distinguish between launched emulators - Wait for android.process.acore instead of init.svc.bootanim on emulator boot - Increased retry timeout when installing app to the emulator - If there is already a started/starting emulator, wait for it's boot instead of trying to deploy to it right away	2015-07-31 03:59:53 -07:00
alsorokin	1ad0665eb5	CB-9404 Fixed an exception when path contained -debug or -release	2015-07-23 18:55:11 +03:00
Joe Bowser	37309c23c2	CB-8320: Setting up gradle so we can use CordovaLib as a standard Android Library	2015-07-22 13:23:28 -07:00
alsorokin	8983ddbdcc	CB-9185 Fixed an issue when unsigned apks couldn't be found. This closes #202	2015-07-22 11:00:07 -07:00
Vladimir Kotikov	d99a21eb8d	CB-9397 Fixes minor issues with `cordova requirements android`	2015-07-22 16:45:49 +03:00
Vladimir Kotikov	f9ce1c607b	CB-9389 Fixes build/check_reqs hang This removes gradle version check since it requires downloading and installing of gradle distributive if it is not installed yet. Partial revert of `4bf705a`	2015-07-22 13:20:39 +03:00
Nikhil Khandelwal	847312fcf9	Update JS snapshot to version 4.2.0-dev (via coho)	2015-07-20 09:52:18 -07:00
Nikhil Khandelwal	b770076b7f	Set VERSION to 4.2.0-dev (via coho)	2015-07-20 09:52:14 -07:00