From 157dcd9ccac01d8b8d311a97092f5c240f496a30 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Mon, 19 Nov 2018 15:45:38 +0000 Subject: [PATCH] Android / Gradle updates (current working build): upgraded API 26 to 28, build tools to 28.0.3, Gradle 4.10.2, max processors / thread 6 (native NDK compiler), see https://github.com/readium/readium-sdk/pull/317 --- .../android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- platform/android/lib/build.gradle | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties index a1347d8..e972ad2 100644 --- a/platform/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/gradle/wrapper/gradle-wrapper.properties @@ -5,5 +5,5 @@ zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists #https://services.gradle.org/distributions # GRADLE EXPERIMENTAL requires 3.3 -# GRADLE STABLE works with latest (4.4) -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +# GRADLE STABLE works with latest (4.10.2) +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/platform/android/lib/build.gradle b/platform/android/lib/build.gradle index 02af41a..a64b8a0 100644 --- a/platform/android/lib/build.gradle +++ b/platform/android/lib/build.gradle @@ -56,12 +56,12 @@ println "${lcpBuildContentFilter}" println "${readiumSdkLibDir}" println "${readiumSdkIncludeDir}" android { - compileSdkVersion 26 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 19 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" @@ -70,7 +70,8 @@ android { if (lcpBuildContentFilter) { targets "clientlib", "contentfilter", "lcp" - arguments "-DFEATURES_READIUM=1", + arguments "-DCMAKE_JOB_POOLS:STRING=compile=6;link=6", + "-DFEATURES_READIUM=1", "-DANDROID_PLATFORM=android-19", "-DANDROID_TOOLCHAIN=${toolchain}", "-DANDROID_STL=${stl}", @@ -80,7 +81,8 @@ android { } else { targets "clientlib", "lcp-min" - arguments "-DANDROID_PLATFORM=android-19", + arguments "-DCMAKE_JOB_POOLS:STRING=compile=6;link=6", + "-DANDROID_PLATFORM=android-19", "-DANDROID_TOOLCHAIN=${toolchain}", "-DANDROID_STL=${stl}", "-DRSDK_INCLUDE_DIR=${readiumSdkIncludeDir}",