BUILDBOT: Change Android to using NDK r9c and thus GCC 4.6.

scummvm · Jan 22, 2014 · 8024a39 · 8024a39
1 parent ba6c267
commit 8024a39
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/config/master.cfg b/config/master.cfg
@@ -902,12 +902,12 @@ scumm_platforms_stable["caanoo"] = p_stable
 # Android
 scumm_root_android = "/opt/toolchains/android"
 scumm_env_android = copy.deepcopy(scumm_env)
-scumm_env_android["PATH"] = "%s/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:%s" % (scumm_root_android, DEFAULT_PATH)
+scumm_env_android["PATH"] = "%s/android-ndk-r9c/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin:%s" % (scumm_root_android, DEFAULT_PATH)
 scumm_env_android["CXX"] = "ccache arm-linux-androideabi-g++"
 scumm_env_android["CXXFLAGS"] = "-isystem %s/3rd-android-4-armeabi-debug/include" % scumm_root_android
 scumm_env_android["LDFLAGS"] = "-L%s/3rd-android-4-armeabi-debug/lib" % scumm_root_android
 scumm_env_android["ANDROID_SDK"] = "%s/android-sdk-linux_x86" % scumm_root_android
-scumm_env_android["ANDROID_NDK"] = "%s/android-ndk-r5b" % scumm_root_android
+scumm_env_android["ANDROID_NDK"] = "%s/android-ndk-r9c" % scumm_root_android
 
 p = {
 	"configureargs": [