lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-04 20:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.13' into dev

Browse Source 
Change-Id: Ie76cb93e16a98f3b2aae0e6785ccca539e5c5f2e
This commit is contained in:
Liang Qi
2019-05-09 15:27:08 +02:00
parent a66a54035c 049eb21a1d
commit f557e0634f
29 changed files with 87 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/common/linux/android_linux.sh
View File

@@ -95,6 +95,7 @@ ls -l "$sdkTargetFolder"
SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"