Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Fix up mistakes from cherry-picks
  • Loading branch information
agrieve committed May 13, 2015
1 parent f5676e8 commit 3a496a0cf3541a9809445c6f5c4db83bc68394da
Showing 4 changed files with 5 additions and 6 deletions.
@@ -105,10 +105,8 @@ perl -i -pe "s/{ID}/$APP_ID/g" config.xml || exit 1
perl -i -pe "s/{NAME}/$APP_NAME/g" config.xml || exit 1
perl -i -pe "s/{VERSION}/$APP_VERSION/g" config.xml || exit 1

PLATFORM_ARGS="${PLATFORMS/android/$AH_PATH/node_modules/cordova-android}"

set -x
$CORDOVA platform add $PLATFORM_ARGS --link || exit 1
$CORDOVA platform add $PLATFORMS --link || exit 1
set +x

if [[ "$PLATFORMS" = *android* ]]; then
@@ -138,6 +136,8 @@ set -x
cordova-plugin-file-transfer \
cordova-plugin-device \
cordova-plugin-network-information \
cordova-plugin-whitelist \
cordova-plugin-chrome-apps-runtime \
cordova-plugin-chrome-apps-sockets-tcp \
cordova-plugin-chrome-apps-sockets-tcpserver \
cordova-plugin-chrome-apps-system-network \
@@ -171,7 +171,6 @@ if [[ "$2" = "--allplugins" ]]; then
cordova-plugin-splashscreen \
cordova-plugin-statusbar \
cordova-plugin-vibration \
cordova-plugin-whitelist \
--link \
--searchpath="$PLUGIN_SEARCH_PATH" \
$PLUGIN_REGISTRY_FLAG || exit $?
@@ -13,7 +13,6 @@
},
"devDependencies": {
"cordova": "latest",
"cordova-android": "apache/cordova-android#4.0.x",
"gulp": "latest",
"gulp-jshint": "~1.6"
}
@@ -22,7 +22,6 @@
<title>Cordova App Harness</title>
<meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-inline' 'unsafe-eval'">
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="generated/style.css" />
<script>THIS_IS_APP_HARNESS=true</script>
<script type="text/javascript" src="../cordova.js"></script>
<script type="text/javascript" src="js/libs/slice.js"></script>
@@ -26,6 +26,7 @@
var _installers = null;
// The app that is currently running.
var activeInstaller = null;
var curWebViewType = null;

function readAppsJson() {
var deferred = $q.defer();
@@ -133,6 +134,7 @@
if (activeInstaller) {
activeInstaller.unlaunch();
activeInstaller = null;
curWebViewType = null;
return AppHarnessUI.destroy();
}
return $q.when();

0 comments on commit 3a496a0

Please sign in to comment.