summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2016-10-20 10:21:15 +0200
committerGitHub <noreply@github.com>2016-10-20 10:21:15 +0200
commit6d504358807fc851282cfe6a1e7baf2032b7fb91 (patch)
treea216c22bab240da615f75dda187143f0616e14e8
parent9a7139b65ccc7d75c256cb04c4ec1e6bd4e327b6 (diff)
downloadqtlocation-mapboxgl-6d504358807fc851282cfe6a1e7baf2032b7fb91.tar.gz
[android] - Configure Gradle properties as part of the instalation process. (#6729)
-rw-r--r--platform/android/CONTRIBUTING_MACOS.md9
-rw-r--r--platform/android/MapboxGLAndroidSDK/gradle.properties3
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/gradle.properties2
-rw-r--r--platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle1
4 files changed, 10 insertions, 5 deletions
diff --git a/platform/android/CONTRIBUTING_MACOS.md b/platform/android/CONTRIBUTING_MACOS.md
index 8343dab835..64b1da85ba 100644
--- a/platform/android/CONTRIBUTING_MACOS.md
+++ b/platform/android/CONTRIBUTING_MACOS.md
@@ -46,6 +46,15 @@ export ANDROID_HOME=/<installation location>/android-sdk-macosx
This environment variable configuration should go into a file that's read on
your shell's startup, like `~/.profile`.
+## Speeding up gradle builds
+
+To optimise you development machine for faster gradle builds create the following `/Users/name/.gradle/gradle.properties` file:
+
+```
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx3072M
+```
+
## Running The TestApp
In order to run the TestApp on an emulator or device the Core GL portion needs to built first. Core GL is the common C++ based OpenGL engine that powers the maps for iOS, Android, and Qt in the project. To build it, open Terminal and run the following commands from the root of the `mapbox-gl-native` source code
diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties
index 19c1370a6c..6aab985298 100644
--- a/platform/android/MapboxGLAndroidSDK/gradle.properties
+++ b/platform/android/MapboxGLAndroidSDK/gradle.properties
@@ -20,6 +20,3 @@ ANDROID_BUILD_SDK_VERSION=23
POM_NAME=Mapbox Android SDK
POM_ARTIFACT_ID=mapbox-android-sdk
POM_PACKAGING=aar
-
-# allows gradle to use more memory
-org.gradle.jvmargs=-Xmx2048M
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/gradle.properties b/platform/android/MapboxGLAndroidSDKTestApp/gradle.properties
deleted file mode 100644
index ef89e27366..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# allows gradle to use more memory
-org.gradle.jvmargs=-Xmx2048M
diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle
index 6fbab3a32c..6bd1fac322 100644
--- a/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle
@@ -30,6 +30,7 @@ android {
versionCode 1
versionName "1.0"
}
+
buildTypes {
release {
minifyEnabled false