From 4540a8ae83fb219e1166d31ebd3cbbe1f2937993 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Thu, 15 Jan 2015 21:07:53 +1100
Subject: [PATCH] Update to Android NDK r10d in new AMI

---
 android/scripts/run-build.sh | 4 ++--
 src/mbgl/shader/shader.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/scripts/run-build.sh b/android/scripts/run-build.sh
index dbf95fb7b..b90bb8260 100755
--- a/android/scripts/run-build.sh
+++ b/android/scripts/run-build.sh
@@ -6,7 +6,7 @@ set -o pipefail
 cwd=$(pwd)
 
 region="us-east-1"
-region_ami="ami-56d1bb3e"
+region_ami="ami-f0ed9098"
 sleep=10
 instance_name="android-gl-build-$TRAVIS_REPO_SLUG-$TRAVIS_JOB_NUMBER"
 echo $ami_name
@@ -26,7 +26,7 @@ user_data="#!/bin/bash
     fi
     git submodule update --init --recursive
 
-    export ANDROID_NDK_PATH=/android/android-ndk-r10c
+    export ANDROID_NDK_PATH=/android/android-ndk-r10d
     export JAVA_HOME=/android/jdk1.7.0_71
     export ANDROID_HOME=/android/android-sdk-linux
     export PATH=\$PATH:/android/jdk1.7.0_71/bin
diff --git a/src/mbgl/shader/shader.cpp b/src/mbgl/shader/shader.cpp
index 5eb354f85..d47723db4 100644
--- a/src/mbgl/shader/shader.cpp
+++ b/src/mbgl/shader/shader.cpp
@@ -67,7 +67,7 @@ Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSo
             if (status == GL_TRUE) {
                 skipCompile = true;
             }
-        } catch(std::exception& e) {
+        } catch(const std::exception& e) {
             Log::Error(Event::Shader, "Loading binary shader failed!");
 
             // Delete the bad file
@@ -221,7 +221,7 @@ Shader::~Shader() {
                 binaryFile.write(reinterpret_cast<char *>(&binaryFormat), sizeof(binaryFormat));
                 binaryFile.write(binary.get(), binaryLength);
 
-            } catch(std::exception& e) {
+            } catch(const std::exception& e) {
                 Log::Error(Event::Shader, "Saving binary shader failed!");
 
                 // Delete the bad file