diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-14 12:15:30 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-14 12:15:30 -0400 |
| commit | 40bf92234e2aa05c7f43a821ad78fde8d50b73fb (patch) | |
| tree | ec5b4c479bfd3678b3e97582b4003711f486d00f /build_android.sh | |
| parent | 5deecd3f1f6190f3efa602230744997a4ea3b129 (diff) | |
fixed crosswalk SSL issues #351
Former-commit-id: a6b5b89694935f8626197a1a139905f5855777da
Diffstat (limited to 'build_android.sh')
| -rwxr-xr-x | build_android.sh | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/build_android.sh b/build_android.sh index 43182a9a..9d91fc92 100755 --- a/build_android.sh +++ b/build_android.sh @@ -27,23 +27,28 @@ if [ "$1" = "2" ]; then echo "only building native view (5+)" fi +echo "Cleaning past builds..." +cordova clean + ############ Crosswalk build #################################### if [ "$BUILD_MODE" = "xwalk" ] || [ "$BUILD_MODE" = "all" ]; then echo "Building Release mode for Xwalk android..." echo "--------------------------------------------" echo "Adding crosswalk..." - #ionic plugin add cordova-plugin-crosswalk-webview --variable "XWALK_VERSION"="18+" - ionic plugin add cordova-plugin-crosswalk-webview + #ionic plugin add cordova-plugin-crosswalk-webview@9.8.0 --variable "XWALK_VERSION"="18+" + ionic plugin remove cordova-plugin-crosswalk-webview + ionic plugin add "https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview#1.8.0" --variable XWALK_MODE="lite" --variable "XWALK_VERSION"="17.46.459.1" + #ionic plugin add cordova-plugin-crosswalk-webview # crosswalk handles SSL certificate handling in a different way # need to switch plugins echo "Adding crosswalk cert plugin..." cordova plugin remove cordova-plugin-certificates cordova plugin add https://github.com/danjarvis/cordova-plugin-crosswalk-certificate - ionic platform remove android - ionic platform add android - cp "$NINJAKEYSTORE" platforms/android + #ionic platform remove android + #ionic platform add android + cp "$NINJAKEYSTORE" platforms/android/ ionic build android --release # copy builds to my release directory @@ -75,12 +80,13 @@ if [ "$BUILD_MODE" = "native" ] || [ "$BUILD_MODE" = "all" ]; then # use the right plugin for SSL certificate mgmt cordova plugin remove cordova-plugin-crosswalk-certificate cordova plugin add https://github.com/hypery2k/cordova-certificate-plugin - ionic platform remove android - ionic platform add android - cp "$NINJAKEYSTORE" platforms/android + #ionic platform remove android + #ionic platform add android + cp "$NINJAKEYSTORE" platforms/android/ # Make sure native builds are only deployed in devices < Android 5 ionic build android --release -- --minSdkVersion=21 + #ionic build android --release -- --minSdkVersion=19 # copy build to release folder and sign cp platforms/android/build/outputs/apk/android-release-unsigned.apk release_files/ |