diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-23 04:05:42 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-23 04:05:42 +0100 |
| commit | f9ed70b2f9d37bfa4347125ef345cd1ff97209b7 (patch) | |
| tree | 8d4565dd1fdd685e786e0f84fb95f44610795da5 /Source/Android | |
| parent | 4ba9cb217f5b1c86991f7f706afdb1a1e05c2305 (diff) | |
| parent | cf6e0b601514b43f41437ba108b86507c5142d91 (diff) | |
Merge pull request #85 from Sonicadvance1/Android-OSXpain
Make it possible to build Dolphin for Android in OS X and also less of a pain with gradle.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/build.gradle | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index a262d6043c..9c2fc82e8e 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.5.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } apply plugin: 'android' @@ -28,6 +28,7 @@ android { tasks.withType(Compile) { compileTask -> compileTask.dependsOn(nativeLibsToJar) } + sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -51,14 +52,19 @@ android { debug.setRoot('build-types/debug') release.setRoot('build-types/release') } + signingConfigs { release { - storeFile file(System.getenv("KEYSTORE")) - storePassword System.getenv("KEYSTORE_PASSWORD") - keyAlias System.getenv("KEY_ALIAS") - keyPassword System.getenv("KEY_PASSWORD") + if (System.getenv("KEYSTORE") != null) + { + storeFile file(System.getenv("KEYSTORE")) + storePassword System.getenv("KEYSTORE_PASSWORD") + keyAlias System.getenv("KEY_ALIAS") + keyPassword System.getenv("KEY_PASSWORD") + } } } + buildTypes { release { signingConfig signingConfigs.release |