From 7471c83ee63a56520d329219ec9abfba37a2b807 Mon Sep 17 00:00:00 2001 From: isuPatches Date: Sun, 23 Jul 2017 19:08:14 -0500 Subject: [PATCH] Go back to SDK-22 --- .travis.yml | 13 ++++--------- wisefy/build.gradle | 7 +++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index caf8f4b0..fd014400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,29 +11,24 @@ cache: android: components: - - tools - platform-tools - tools - build-tools-26.0.0 - - android-24 + - android-22 - android-26 + - sys-img-armeabi-v7a-android-22 - extra-android-m2repository - extra-android-support - extra-google-m2repository - - sys-img-arm64-v8a-google_apis-24 env: matrix: - - $TARGET=android-24 ABI=google_apis/arm64-v8a + - $TARGET=android-22 ABI=armeabi-v7a before_script: - - echo $JAVA_OPTS - - export JAVA_OPTS=-Xmx2048m - - android list targets - echo no | android create avd --force -n test -t $TARGET --abi $ABI - - emulator -avd test -no-audio -no-window & + - emulator -avd test -no-skin -no-audio -no-window & - android-wait-for-emulator - - adb shell setprop dalvik.vm.dexopt-flags v=n,o=v - adb shell input keyevent 82 & script: diff --git a/wisefy/build.gradle b/wisefy/build.gradle index f32957ed..54c8e86d 100644 --- a/wisefy/build.gradle +++ b/wisefy/build.gradle @@ -16,6 +16,13 @@ dexcount { android { dexOptions { + // Sets the maximum number of DEX processes + // that can be started concurrently. + maxProcessCount 8 + // Sets the maximum memory allocation pool size + // for the dex operation. + javaMaxHeapSize "2g" + // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false. preDexLibraries = preDexEnabled && !travisBuild }