Commit 684f6995 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧

android: Port away from QT_ANDROID

parent 6820eb81
......@@ -194,7 +194,7 @@ for project in orderToBuild:
# Are we on Android?
# If so, we may need to build system dependencies of the project we are about to try to build
if 'QT_ANDROID' in os.environ and sys.platform == 'linux':
if 'ANDROID_HOME' in os.environ and sys.platform == 'linux':
# Perform the system dependency build...
systemDependencyCommand = '"{baseDirectory}/ci-tooling/helpers/build-android-system-dependency.sh" {productName} {projectName} {currentPlatform}'
commandToRun = systemDependencyCommand.format(
......
......@@ -26,14 +26,13 @@ def generateFor( installPrefix ):
envChanges = changesForPrefix( utilsPrefix, envChanges )
# Are we performing an Android build?
if 'QT_ANDROID' in os.environ and sys.platform == 'linux':
if 'ANDROID_HOME' in os.environ and sys.platform == 'linux':
# Then we need to include the separate Qt SDK for Android
# Grab it's directory
androidQtSDKRoot = os.environ['QT_ANDROID']
# Ensure it is added into our environment
envChanges = changesForPrefix( androidQtSDKRoot, envChanges )
envChanges = changesForPrefix( '/opt/Qt', envChanges )
# We also need to include other dependencies which are shipped in the Docker SDK image
envChanges = changesForPrefix( '/opt/kdeandroid-deps', envChanges )
envChanges = changesForPrefix( '/opt/kdeandroid-arm', envChanges )
envChanges = changesForPrefix( '/opt/kdeandroid-arm64', envChanges )
# Otherwise are we on a Non-Windows / Mac platform?
elif sys.platform != 'win32' and sys.platform != 'darwin':
......
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