ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android] Fix the gradle build system to allow for building from terminal. It will now copy the library files correctly and sign the resulting apk.

This commit is contained in:
Ryan Houdek 2013-12-24 15:28:24 -06:00
parent a87e0e7489
commit 2ed24d5311
1 changed files with 55 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Source/Android/build.gradle
View File

@ -1,42 +1,67 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.5.+' classpath 'com.android.tools.build:gradle:0.5.+'
} }
} }
apply plugin: 'android' apply plugin: 'android'
dependencies { dependencies {
compile fileTree(dir: 'libs', include: '*.jar') compile fileTree(dir: 'libs', include: '*.jar')
compile fileTree(dir: "$buildDir/native-libs", include: 'native-libs.jar')
} }
android { android {
compileSdkVersion 18 compileSdkVersion 19
buildToolsVersion "18.0.1" buildToolsVersion "19.0.1"
sourceSets { task nativeLibsToJar(type: Zip, description: 'create a jar archive of the native libs') {
main { destinationDir file("$buildDir/native-libs")
manifest.srcFile 'AndroidManifest.xml' baseName 'native-libs'
java.srcDirs = ['src'] extension 'jar'
resources.srcDirs = ['src'] from fileTree(dir: 'libs', include: '**/*.so')
aidl.srcDirs = ['src'] into 'lib/'
renderscript.srcDirs = ['src'] }
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
// Move the tests to tests/java, tests/res, etc... tasks.withType(Compile) {
instrumentTest.setRoot('tests') compileTask -> compileTask.dependsOn(nativeLibsToJar)
}
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
// Move the build types to build-types/<type> // Move the tests to tests/java, tests/res, etc...
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... instrumentTest.setRoot('tests')
// This moves them out of them default location under src/<type>/... which would
// conflict with src/ being used by the main source set. // Move the build types to build-types/<type>
// Adding new build types or product flavors should be accompanied // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
// by a similar customization. // This moves them out of them default location under src/<type>/... which would
debug.setRoot('build-types/debug') // conflict with src/ being used by the main source set.
release.setRoot('build-types/release') // Adding new build types or product flavors should be accompanied
} // by a similar customization.
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")
}
}
buildTypes {
release {
signingConfig signingConfigs.release
}
}
} }