mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-09 18:45:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1725 from Sonicadvance1/update_gradle

Browse Source 
Updates the gradle build file to the latest needed for Android Studio.
This commit is contained in:
Matthew Parlane 2014-12-21 14:31:05 +13:00
commit f4ab1443fa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Android/build.gradle
View File

@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.12.+' classpath 'com.android.tools.build:gradle:1.0.0+'
} }
} }
apply plugin: 'android' apply plugin: 'android'
@ -25,7 +25,7 @@ android {
into 'lib/' into 'lib/'
} }
tasks.withType(Compile) { tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn(nativeLibsToJar) compileTask -> compileTask.dependsOn(nativeLibsToJar)
} }
@ -79,8 +79,9 @@ android {
// Signed by debug key disallowing distribution on Play Store. // Signed by debug key disallowing distribution on Play Store.
// Attaches 'debug' suffix to version and package name, allowing installation alongside the release build. // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
debug { debug {
packageNameSuffix '.debug' applicationIdSuffix ".debug"
versionNameSuffix '-debug' versionNameSuffix '-debug'
jniDebuggable true
} }
} }
} }