2 Commits

Author	SHA1	Message	Date
Liang Qi	4477c49291	Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh Change-Id: Ib972234bb644353db6920b2dcbe1fd4775ef1779	2016-09-12 15:09:56 +02:00
Heikki Halmet	f1de674fd9	Android sdk and ndk to provisioning for qt5.6 ... Install latest Android sdk and ndk. It also runs update for SDK API level 18, latest SDK- and platform- tools and build-tools version 23.0.3. Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. Change-Id: Iddc353674a65e0af7a9036d9296b9c2933fa114f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2016-09-12 09:47:22 +00:00