Commit 09b17c00 authored by Geoffrey Métais's avatar Geoffrey Métais

Use only one gradle config file

parent 539554ab
......@@ -89,10 +89,8 @@ if [ ! -f gradle.properties ]; then
echo keyStoreFile=$KEYSTORE_FILE > gradle.properties
echo storealias=androiddebugkey >> gradle.properties
echo storepwd=android >> gradle.properties
fi
if [ ! -f local.properties ]; then
echo sdk.dir=$ANDROID_SDK > local.properties
echo ndk.dir=$ANDROID_NDK >> local.properties
echo sdk=$ANDROID_SDK >> gradle.properties
echo ndk=$ANDROID_NDK >> gradle.properties
fi
####################
......
......@@ -11,29 +11,22 @@ task buildDebug(type:Exec) {
ndk.dir=/home/<username>/SDK/android-ndk-r10b
*/
if (System.getenv('ANDROID_SDK') == null || System.getenv('ANDROID_NDK') == null) {
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
environment 'ANDROID_NDK', properties.getProperty('ndk.dir')
environment 'ANDROID_SDK', properties.getProperty('sdk.dir')
environment 'ANDROID_ABI', properties.getProperty('abi')
environment 'ANDROID_NDK', ndk
environment 'ANDROID_SDK', sdk
}
workingDir '..'
commandLine './compile-libvlc.sh'
// args('jni')
}
task buildRelease(type:Exec) {
if (System.getenv('ANDROID_SDK') == null || System.getenv('ANDROID_NDK') == null) {
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
environment 'ANDROID_NDK', properties.getProperty('ndk.dir')
environment 'ANDROID_SDK', properties.getProperty('sdk.dir')
environment 'ANDROID_ABI', properties.getProperty('abi')
environment 'ANDROID_NDK', ndk
environment 'ANDROID_SDK', sdk
}
workingDir '..'
commandLine './compile-libvlc.sh'
// args('jni', 'release')
args('--release')
}
android {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment