diff options
| author | Christian S <christian@pix-art.de> | 2016-04-07 20:24:29 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-07 20:24:29 +0200 |
| commit | 6291c64dd743e36539d06a0dbc242a25475989f9 (patch) | |
| tree | 807c79fc6f1752edebd144531d54ac11f9100ba9 /build.gradle | |
| parent | 9317ea212cbf4f1bd739ed37c7702b52791c11a5 (diff) | |
| parent | ecaf75e5ecf785dbe83a4d1ec5f9a76d22e688ad (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/build.gradle b/build.gradle index 90239457c..74ff02faa 100644 --- a/build.gradle +++ b/build.gradle @@ -54,6 +54,12 @@ dependencies { playstoreCompile 'com.google.android.gms:play-services-gcm:8.4.0' } +ext { + travisBuild = System.getenv("TRAVIS") == "true" + // allows for -Dpre-dex=false to be set + preDexEnabled = "true".equals(System.getProperty("pre-dex", "true")) +} + android { compileSdkVersion 23 buildToolsVersion "23.0.2" @@ -67,6 +73,11 @@ android { applicationId "eu.siacs.conversations" } + dexOptions { + // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false. + preDexLibraries = preDexEnabled && !travisBuild + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 |