Commit 7198aa42 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Revert "Use only one gradle config file"

This reverts commit 09b17c00.

Conflicts:
	libvlc/build.gradle
parent 277dee99
......@@ -89,8 +89,10 @@ if [ ! -f gradle.properties ]; then
echo keyStoreFile=$KEYSTORE_FILE > gradle.properties
echo storealias=androiddebugkey >> gradle.properties
echo storepwd=android >> gradle.properties
echo sdk=$ANDROID_SDK >> gradle.properties
echo ndk=$ANDROID_NDK >> gradle.properties
fi
if [ ! -f local.properties ]; then
echo sdk.dir=$ANDROID_SDK > local.properties
echo ndk.dir=$ANDROID_NDK >> local.properties
fi
####################
......
......@@ -12,8 +12,11 @@ task buildDebugARM(type:Exec) {
ndk.dir=/home/<username>/SDK/android-ndk-r10b
*/
if (System.getenv('ANDROID_SDK') == null || System.getenv('ANDROID_NDK') == null) {
environment 'ANDROID_NDK', ndk
environment 'ANDROID_SDK', sdk
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')
}
workingDir '..'
commandLine './compile-libvlc.sh'
......@@ -22,8 +25,11 @@ task buildDebugARM(type:Exec) {
task buildDebugx86(type:Exec) {
if (System.getenv('ANDROID_SDK') == null || System.getenv('ANDROID_NDK') == null) {
environment 'ANDROID_NDK', ndk
environment 'ANDROID_SDK', sdk
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')
}
workingDir '..'
commandLine './compile-libvlc.sh'
......
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