piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #85 from Sonicadvance1/Android-OSXpain

Browse Source 
Make it possible to build Dolphin for Android in OS X and also less of a pain with gradle.
This commit is contained in:
Pierre Bourdon 2014-02-23 04:05:42 +01:00
commit f9ed70b2f9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Android/build.gradle
View File

@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.5.+' classpath 'com.android.tools.build:gradle:0.8.+'
} }
} }
apply plugin: 'android' apply plugin: 'android'
@ -28,6 +28,7 @@ android {
tasks.withType(Compile) { tasks.withType(Compile) {
compileTask -> compileTask.dependsOn(nativeLibsToJar) compileTask -> compileTask.dependsOn(nativeLibsToJar)
} }
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
@ -51,14 +52,19 @@ android {
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')
} }
signingConfigs { signingConfigs {
release { release {
storeFile file(System.getenv("KEYSTORE")) if (System.getenv("KEYSTORE") != null)
storePassword System.getenv("KEYSTORE_PASSWORD") {
keyAlias System.getenv("KEY_ALIAS") storeFile file(System.getenv("KEYSTORE"))
keyPassword System.getenv("KEY_PASSWORD") storePassword System.getenv("KEYSTORE_PASSWORD")
keyAlias System.getenv("KEY_ALIAS")
keyPassword System.getenv("KEY_PASSWORD")
}
} }
} }
buildTypes { buildTypes {
release { release {
signingConfig signingConfigs.release signingConfig signingConfigs.release