From 4d2548fb199e8c8647348003f48df2ea85f45bd1 Mon Sep 17 00:00:00 2001 From: "a.yankovich" Date: Tue, 24 Dec 2019 17:09:52 +0300 Subject: [PATCH] fix env --- BuildBotLib/qmake.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BuildBotLib/qmake.py b/BuildBotLib/qmake.py index 6929272..197b60e 100644 --- a/BuildBotLib/qmake.py +++ b/BuildBotLib/qmake.py @@ -126,9 +126,6 @@ def androidQmake(props): '-spec', 'android-clang', "-r", "CONFIG+=qtquickcompiler", - 'ANDROID_NDK_ROOT=/home/andrei/Android/ndk-bundle', - 'JAVA_HOME=/usr', - 'ANDROID_HOME=/home/andrei/Android', 'SIGN_PATH="' + secret.getValue('SIGPATH') + '"', 'SIGN_ALIES="quasarapp"', 'SIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"' @@ -144,7 +141,9 @@ def AndroidSteps() : command = androidQmake, haltOnFailure = True, doStepIf = lambda step : isAndroid(step), - + env={{'ANDROID_NDK_ROOT': '/home/andrei/Android/ndk-bundle', + 'JAVA_HOME': '/usr', + 'ANDROID_HOME': '/home/andrei/Android'}}, name = 'QMake Android', description = 'create a make files for projects', ),