1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow overriding Android NDK host on Windows

Browse Source 
The -android-ndk-host argument to configure existed in the shell
script, but not in the Windows version. When using a 64-bit NDK
but a 32-bit host compiler (which is what we bundle with our
SDK), we would not detect the correct NDK host, making it impossible
to build Qt with this combo.

[ChangeLog][Android] Added -android-ndk-host configure option on
Windows.

Change-Id: Ie6a92b66e6875ed53f46fe41ecced70c3ec67585
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2016-03-09 18:27:50 +01:00
parent fb196e8807
commit 437f5662d3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/configure/configureapp.cpp
View File

@ -1370,6 +1370,14 @@ void Configure::parseCmdLine()
dictionary[ "ANDROID_PLATFORM" ] = configCmdLine.at(i); dictionary[ "ANDROID_PLATFORM" ] = configCmdLine.at(i);
} }
else if (configCmdLine.at(i) == "-android-ndk-host") {
++i;
if (i == argCount)
break;
dictionary[ "ANDROID_HOST" ] = configCmdLine.at(i);
}
else if (configCmdLine.at(i) == "-android-arch") { else if (configCmdLine.at(i) == "-android-arch") {
++i; ++i;
if (i == argCount) if (i == argCount)
@ -3464,7 +3472,9 @@ void Configure::generateQDevicePri()
deviceStream << "android_install {" << endl; deviceStream << "android_install {" << endl;
deviceStream << " DEFAULT_ANDROID_SDK_ROOT = " << formatPath(dictionary["ANDROID_SDK_ROOT"]) << endl; deviceStream << " DEFAULT_ANDROID_SDK_ROOT = " << formatPath(dictionary["ANDROID_SDK_ROOT"]) << endl;
deviceStream << " DEFAULT_ANDROID_NDK_ROOT = " << formatPath(dictionary["ANDROID_NDK_ROOT"]) << endl; deviceStream << " DEFAULT_ANDROID_NDK_ROOT = " << formatPath(dictionary["ANDROID_NDK_ROOT"]) << endl;
if (QSysInfo::WordSize == 64) if (dictionary.contains("ANDROID_HOST"))
deviceStream << " DEFAULT_ANDROID_NDK_HOST = " << dictionary["ANDROID_HOST"] << endl;
else if (QSysInfo::WordSize == 64)
deviceStream << " DEFAULT_ANDROID_NDK_HOST = windows-x86_64" << endl; deviceStream << " DEFAULT_ANDROID_NDK_HOST = windows-x86_64" << endl;
else else
deviceStream << " DEFAULT_ANDROID_NDK_HOST = windows" << endl; deviceStream << " DEFAULT_ANDROID_NDK_HOST = windows" << endl;