Merge pull request #3451 from Project-OSRM/update/mason

Update mason to v0.3.0 and change update script
Project-OSRM · Dec 15, 2016 · 9832825 · 9832825
2 parents d584bca + 6e29f98
commit 9832825
Show file tree

Hide file tree

Showing 423 changed files with 2,630 additions and 3,083 deletions.
diff --git a/scripts/update_dependencies.sh b/scripts/update_dependencies.sh
@@ -9,34 +9,66 @@ set -o nounset
 # structure will be lost.
 # http://git.661346.n2.nabble.com/subtree-merges-lose-prefix-after-rebase-td7332850.html
 
-OSMIUM_REPO=https://github.com/osmcode/libosmium.git
+OSMIUM_REPO="https://github.com/osmcode/libosmium.git"
 OSMIUM_TAG=v2.10.2
 
-VARIANT_REPO=https://github.com/mapbox/variant.git
+VARIANT_REPO="https://github.com/mapbox/variant.git"
 VARIANT_TAG=v1.1.0
 
-MASON_REPO=https://github.com/mapbox/mason.git
-MASON_TAG=v0.1.1
+MASON_REPO="https://github.com/mapbox/mason.git"
+MASON_TAG=v0.3.0
 
 SOL_REPO="https://github.com/ThePhD/sol2.git"
 SOL_TAG=v2.15.4
 
-VARIANT_LATEST=$(curl https://api.github.com/repos/mapbox/variant/releases/latest | jq ".tag_name")
-OSMIUM_LATEST=$(curl https://api.github.com/repos/osmcode/libosmium/releases/latest | jq ".tag_name")
-MASON_LATEST=$(curl https://api.github.com/repos/mapbox/mason/releases/latest | jq ".tag_name")
+VARIANT_LATEST=$(curl "https://api.github.com/repos/mapbox/variant/releases/latest" | jq ".tag_name")
+OSMIUM_LATEST=$(curl "https://api.github.com/repos/osmcode/libosmium/releases/latest" | jq ".tag_name")
+MASON_LATEST=$(curl "https://api.github.com/repos/mapbox/mason/releases/latest" | jq ".tag_name")
 SOL_LATEST=$(curl "https://api.github.com/repos/ThePhD/sol2/releases/latest" | jq ".tag_name")
 
 echo "Latest osmium release is $OSMIUM_LATEST, pulling in \"$OSMIUM_TAG\""
 echo "Latest variant release is $VARIANT_LATEST, pulling in \"$VARIANT_TAG\""
 echo "Latest mason release is $MASON_LATEST, pulling in \"$MASON_TAG\""
 echo "Latest sol2 release is $SOL_LATEST, pulling in \"$SOL_TAG\""
 
-read -p "Looks good? (Y/n) " ok
+read -p "Update osmium (y/n) " ok
+if [[ $ok =~ [yY] ]]
+then
+  if [ -d "third_party/libosmium" ]; then
+    git subtree pull -P third_party/libosmium/ $OSMIUM_REPO $OSMIUM_TAG --squash
+  else
+    git subtree add -P third_party/libosmium/ $OSMIUM_REPO $OSMIUM_TAG --squash
+  fi
+fi
+
+read -p "Update variant (y/n) " ok
+if [[ $ok =~ [yY] ]]
+then
+  if [ -d "third_party/variant" ]; then
+    git subtree pull -P third_party/variant/ $VARIANT_REPO $VARIANT_TAG --squash
+  else
+    git subtree add -P third_party/variant/ $VARIANT_REPO $VARIANT_TAG --squash
+  fi
+fi
 
+read -p "Update mason (y/n) " ok
 if [[ $ok =~ [yY] ]]
 then
-  git subtree pull -P third_party/libosmium/ $OSMIUM_REPO $OSMIUM_TAG --squash
-  git subtree pull -P third_party/variant/ $VARIANT_REPO $VARIANT_TAG --squash
-  git subtree pull -P third_party/mason/ $MASON_REPO $MASON_TAG --squash
-  git subtree pull -P third_party/sol2/sol2/ $SOL_REPO $SOL_TAG --squash
+  if [ -d "third_party/mason" ]; then
+    git subtree pull -P third_party/mason/ $MASON_REPO $MASON_TAG --squash
+  else
+    git subtree add -P third_party/mason/ $MASON_REPO $MASON_TAG --squash
+  fi
 fi
+
+read -p "Update sol2 (y/n) " ok
+if [[ $ok =~ [yY] ]]
+then
+  if [ -d "third_party/sol2" ]; then
+    git subtree pull -P third_party/sol2/sol2/ $SOL_REPO $SOL_TAG --squash
+  else
+    git subtree add -P third_party/sol2/sol2/ $SOL_REPO $SOL_TAG --squash
+  fi
+fi
+
+
diff --git a/third_party/mason/CHANGELOG.md b/third_party/mason/CHANGELOG.md
@@ -1,4 +1,25 @@
 
+## 0.3.0
+
+ - Updated android compile flags
+ - Added v8 `5.1.281.47` and `3.14.5.10`
+ - Fixed boost library name reporting
+ - Added tippecanoe `1.15.1`
+ - Added `iwyu` and `asan_symbolize` python script to llvm+clang++ packages
+
+Changes: https://github.com/mapbox/mason/compare/v0.1.1...v0.2.0
+
+## 0.2.0
+
+ - Added icu 58.1, mesa egl, boost 1.62.0, gdb 7.12, Android NDK r13b, binutils latest,
+   variant 1.1.4, geometry 0.9.0, geojson 0.4.0, pkgconfig 0.29.1, wagyu 1.0
+ - Removed boost *all* packages
+ - Renamed `TRAVIS_TOKEN` to `MASON_TRAVIS_TOKEN`
+ - Now including llvm-ar and llvm-ranlib in clang++ package
+ - Now setting secure variables in mason rather than .travis.yml per package
+
+Changes: https://github.com/mapbox/mason/compare/v0.1.1...v0.2.0
+
 ## 0.1.1
 
  - Added binutils 2.27, expat 2.2.0, mesa 13.0.0, and llvm 4.0.0 (in-development)

diff --git a/third_party/mason/README.md b/third_party/mason/README.md
@@ -170,17 +170,17 @@ This command only works if the package has already been installed. When run it s
 
 In order to ensure that all prebuilt binaries are consistent and reproducible, we perform the final build and publish operation on Travis CI.
 
-First set the `TRAVIS_TOKEN` environment variable. You can do this either by installing the `travis` gem and running `travis token` or by using `curl` to hit the Travis api directly. See details on this below.
+First set the `MASON_TRAVIS_TOKEN` environment variable. You can do this either by installing the `travis` gem and running `travis token` or by using `curl` to hit the Travis api directly. See details on this below. **WARNING: be careful to keep this token safe. Cycling it requires emailing [email protected]. Giving someone an access token is like giving them full access to your Travis account.**
 
-Once you are set up with your `TRAVIS_TOKEN` then use the `trigger` command to kick off a build:
+Once you are set up with your `MASON_TRAVIS_TOKEN` then use the `trigger` command to kick off a build:
 
 ```bash
 ./mason trigger <package name> <package version>
 ```
 
 Run this command from the root of a local mason repository checkout. It makes a request to the Travis API to build and publish the specified version of the package, using the Travis configuration in `./scripts/${MASON_NAME}/${MASON_VERSION}/.travis.yml`.
 
-1) Using curl and travis api to generate TRAVIS_TOKEN
+1) Using curl and travis api to generate MASON_TRAVIS_TOKEN
 
 First generate a github personal access token that has `repo` scope by going to https://github.com/settings/tokens. More details at https://help.github.com/articles/creating-an-access-token-for-command-line-use/.
 

diff --git a/third_party/mason/contributing.md b/third_party/mason/contributing.md
@@ -4,5 +4,11 @@
 - Increment version in test/unit.sh
 - Update changelog
 - Ensure tests are passing
-- Tag a release: `git tag v0.1.0 -a -m "v0.1.0" && git push --tags`
+- Tag a release:
+
+```
+TAG_NAME=$(cat mason | grep MASON_RELEASED_VERSION= | cut -c25-29)
+git tag v${TAG_NAME} -a -m "v${TAG_NAME}" && git push --tags
+```
+
 - Go to https://github.com/mapbox/mason/releases/new and create a new release
diff --git a/third_party/mason/mason b/third_party/mason/mason
@@ -7,7 +7,7 @@ MASON_VERSION=$1 ; shift
 set -e
 set -o pipefail
 
-MASON_RELEASED_VERSION="0.1.1"
+MASON_RELEASED_VERSION="0.3.0"
 
 if [ "${MASON_COMMAND}" = "--version" ]; then
     echo ${MASON_RELEASED_VERSION}
@@ -43,8 +43,8 @@ elif [ -z "${MASON_VERSION}" ]; then
 fi
 
 if [ "${MASON_COMMAND}" = "trigger" ]; then
-    if [ -z "${TRAVIS_TOKEN}" ]; then
-        echo "TRAVIS_TOKEN is not set."
+    if [ -z "${MASON_TRAVIS_TOKEN}" ]; then
+        echo "MASON_TRAVIS_TOKEN is not set."
         exit 1
     fi
 
@@ -54,6 +54,8 @@ if [ "${MASON_COMMAND}" = "trigger" ]; then
     config = YAML.load_file("scripts/${MASON_NAME}/${MASON_VERSION}/.travis.yml")
     config["env"] ||= {}
     config["env"]["global"] ||= []
+    config["env"]["global"] << {"secure" => "VI6PAoen/TwUM2ynPt8890HKq6zc/e/jTZwYX1D9/BdzkOrTcztxZxO9hP5lsnYeqcNeLXgHpO4LVxm95gjodLLkSXUNW6JndRaiCVHS7dwkN+Oe9XWJajw5z1fRJjnCxhgICfHK/J3H+klKtvOJb2OMDc6W7UAoH/OWGDbBJ5w="}
+    config["env"]["global"] << {"secure" => "BVefSxpbYyQbruXm61pDwnawEN0KdvM865muccfEshAM9pPxd24NoB7JYeUdkktgWnO3QCmy3RTw0ck7DbjHTt0HT6AqXcNFYjCxbLWM+jmQDnDv8bxWas/2XU8jP+vK+OUDsYE5IL7ZevBYPY1dUWv6fOQt7NPKnhoar9KsDoQ="}
     config["env"]["global"] << "MASON_NAME=${MASON_NAME}" << "MASON_VERSION=${MASON_VERSION}"
     puts JSON.pretty_generate(config)
 RUBY
@@ -71,7 +73,7 @@ RUBY
         -H "Content-Type: application/json" \
         -H "Accept: application/json" \
         -H "Travis-API-Version: 3" \
-        -H "Authorization: token ${TRAVIS_TOKEN}" \
+        -H "Authorization: token ${MASON_TRAVIS_TOKEN}" \
         -d "$body"
 
     echo "Now go to https://travis-ci.org/mapbox/mason/builds to view build status"

diff --git a/third_party/mason/mason.sh b/third_party/mason/mason.sh
@@ -132,91 +132,77 @@ elif [ ${MASON_PLATFORM} = 'android' ]; then
         *) export MASON_ANDROID_ABI=${MASON_ANDROID_ABI:-arm-v7}
     esac
 
-    CFLAGS="-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-integrated-as -fomit-frame-pointer -fstrict-aliasing -Wno-invalid-command-line-argument -Wno-unused-command-line-argument"
-    LDFLAGS="-no-canonical-prefixes -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,-z,now -Wl,-z,relro"
+    CFLAGS="-g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security"
+    LDFLAGS="-Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--no-undefined -Wl,-z,noexecstack -Qunused-arguments -Wl,-z,relro -Wl,-z,now"
     export CPPFLAGS="-D__ANDROID__"
 
     if [ ${MASON_ANDROID_ABI} = 'arm-v8' ]; then
         MASON_ANDROID_TOOLCHAIN="aarch64-linux-android"
-        MASON_ANDROID_CROSS_COMPILER="aarch64-linux-android-4.9"
         export MASON_HOST_ARG="--host=${MASON_ANDROID_TOOLCHAIN}"
 
-        export CFLAGS="-target aarch64-none-linux-android -D_LITTLE_ENDIAN ${CFLAGS}"
-
-        # Using bfd for aarch64: https://code.google.com/p/android/issues/detail?id=204151
-        export LDFLAGS="-target aarch64-none-linux-android -fuse-ld=bfd ${LDFLAGS}"
+        CFLAGS="-target aarch64-none-linux-android ${CFLAGS}"
 
         export JNIDIR="arm64-v8a"
         MASON_ANDROID_ARCH="arm64"
         MASON_ANDROID_PLATFORM="21"
 
     elif [ ${MASON_ANDROID_ABI} = 'arm-v7' ]; then
         MASON_ANDROID_TOOLCHAIN="arm-linux-androideabi"
-        MASON_ANDROID_CROSS_COMPILER="arm-linux-androideabi-4.9"
         export MASON_HOST_ARG="--host=${MASON_ANDROID_TOOLCHAIN}"
 
-        export CFLAGS="-target armv7-none-linux-androideabi -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -D_LITTLE_ENDIAN ${CFLAGS}"
-        export LDFLAGS="-target armv7-none-linux-androideabi -march=armv7-a -Wl,--fix-cortex-a8 -fuse-ld=gold ${LDFLAGS}"
+        CFLAGS="-target armv7-none-linux-androideabi ${CFLAGS} -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fno-integrated-as -mthumb"
+        LDFLAGS="${LDFLAGS} -Wl,--fix-cortex-a8 -Wl,--exclude-libs,libunwind.a"
 
         export JNIDIR="armeabi-v7a"
         MASON_ANDROID_ARCH="arm"
         MASON_ANDROID_PLATFORM="9"
 
     elif [ ${MASON_ANDROID_ABI} = 'arm-v5' ]; then
         MASON_ANDROID_TOOLCHAIN="arm-linux-androideabi"
-        MASON_ANDROID_CROSS_COMPILER="arm-linux-androideabi-4.9"
         export MASON_HOST_ARG="--host=${MASON_ANDROID_TOOLCHAIN}"
 
-        export CFLAGS="-target armv5te-none-linux-androideabi -march=armv5te -mtune=xscale -msoft-float -D_LITTLE_ENDIAN ${CFLAGS}"
-        export LDFLAGS="-target armv5te-none-linux-androideabi -march=armv5te -fuse-ld=gold ${LDFLAGS}"
+        CFLAGS="-target armv5te-none-linux-androideabi ${CFLAGS} -march=armv5te -mtune=xscale -msoft-float -fno-integrated-as -mthumb"
+        LDFLAGS="${LDFLAGS} -Wl,--exclude-libs,libunwind.a"
 
         export JNIDIR="armeabi"
         MASON_ANDROID_ARCH="arm"
         MASON_ANDROID_PLATFORM="9"
 
     elif [ ${MASON_ANDROID_ABI} = 'x86' ]; then
         MASON_ANDROID_TOOLCHAIN="i686-linux-android"
-        MASON_ANDROID_CROSS_COMPILER="x86-4.9"
         export MASON_HOST_ARG="--host=${MASON_ANDROID_TOOLCHAIN}"
 
-        export CFLAGS="-target i686-none-linux-android -march=i686 -msse3 -mfpmath=sse ${CFLAGS}"
-        export LDFLAGS="-target i686-none-linux-android -march=i686 -fuse-ld=gold ${LDFLAGS}"
+        CFLAGS="-target i686-none-linux-android ${CFLAGS}"
 
         export JNIDIR="x86"
         MASON_ANDROID_ARCH="x86"
         MASON_ANDROID_PLATFORM="9"
 
     elif [ ${MASON_ANDROID_ABI} = 'x86-64' ]; then
         MASON_ANDROID_TOOLCHAIN="x86_64-linux-android"
-        MASON_ANDROID_CROSS_COMPILER="x86_64-4.9"
         export MASON_HOST_ARG="--host=${MASON_ANDROID_TOOLCHAIN}"
 
         export JNIDIR="x86_64"
-        export CFLAGS="-target x86_64-none-linux-android -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel ${CFLAGS}"
-        export LDFLAGS="-target x86_64-none-linux-android -march=x86-64 -fuse-ld=gold ${LDFLAGS}"
+        CFLAGS="-target x86_64-none-linux-android ${CFLAGS}"
 
         MASON_ANDROID_ARCH="x86_64"
         MASON_ANDROID_PLATFORM="21"
 
     elif [ ${MASON_ANDROID_ABI} = 'mips' ]; then
         MASON_ANDROID_TOOLCHAIN="mipsel-linux-android"
-        MASON_ANDROID_CROSS_COMPILER="mipsel-linux-android-4.9"
         export MASON_HOST_ARG="--host=${MASON_ANDROID_TOOLCHAIN}"
 
-        export CFLAGS="-target mipsel-none-linux-android ${CFLAGS}"
-        export LDFLAGS="-target mipsel-none-linux-android ${LDFLAGS}"
+        CFLAGS="-target mipsel-none-linux-android ${CFLAGS} -mips32"
 
         export JNIDIR="mips"
         MASON_ANDROID_ARCH="mips"
         MASON_ANDROID_PLATFORM="9"
 
     elif [ ${MASON_ANDROID_ABI} = 'mips-64' ]; then
         MASON_ANDROID_TOOLCHAIN="mips64el-linux-android"
-        MASON_ANDROID_CROSS_COMPILER="mips64el-linux-android-4.9"
         export MASON_HOST_ARG="--host=${MASON_ANDROID_TOOLCHAIN}"
 
-        export CFLAGS="-target mips64el-none-linux-android ${CFLAGS}"
-        export LDFLAGS="-target mips64el-none-linux-android ${LDFLAGS}"
+        CFLAGS="-target mips64el-none-linux-android ${CFLAGS}"
 
         export JNIDIR="mips64"
         MASON_ANDROID_ARCH="mips64"
@@ -228,7 +214,7 @@ elif [ ${MASON_PLATFORM} = 'android' ]; then
     MASON_API_LEVEL=${MASON_API_LEVEL:-android-$MASON_ANDROID_PLATFORM}
 
     # Installs the native SDK
-    export MASON_NDK_PACKAGE_VERSION=${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}-r12b
+    export MASON_NDK_PACKAGE_VERSION=${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}-r13b
     MASON_SDK_ROOT=$(MASON_PLATFORM= MASON_PLATFORM_VERSION= ${MASON_DIR}/mason prefix android-ndk ${MASON_NDK_PACKAGE_VERSION})
     if [ ! -d ${MASON_SDK_ROOT} ] ; then
         MASON_PLATFORM= MASON_PLATFORM_VERSION= ${MASON_DIR}/mason install android-ndk ${MASON_NDK_PACKAGE_VERSION}
@@ -433,6 +419,7 @@ function mason_build {
         for ARCH in ${SIMULATOR_TARGETS} ; do
             mason_substep "Building for iOS Simulator ${ARCH}..."
             export CFLAGS="${MASON_ISIM_CFLAGS} -arch ${ARCH}"
+            export CXXFLAGS="${MASON_ISIM_CFLAGS} -arch ${ARCH}"
             cd "${MASON_BUILD_PATH}"
             mason_compile
             cd "${MASON_PREFIX}"
@@ -444,6 +431,7 @@ function mason_build {
         for ARCH in ${DEVICE_TARGETS} ; do
             mason_substep "Building for iOS ${ARCH}..."
             export CFLAGS="${MASON_IOS_CFLAGS} -arch ${ARCH}"
+            export CXXFLAGS="${MASON_IOS_CFLAGS} -arch ${ARCH}"
             cd "${MASON_BUILD_PATH}"
             mason_compile
             cd "${MASON_PREFIX}"
@@ -575,8 +563,11 @@ function mason_try_binary {
 
 
 function mason_pkgconfig {
-    echo pkg-config \
-        ${MASON_PREFIX}/${MASON_PKGCONFIG_FILE}
+    MASON_PKGCONFIG_FILES=""
+    for pkgconfig_file in ${MASON_PKGCONFIG_FILE}; do
+        MASON_PKGCONFIG_FILES="${MASON_PKGCONFIG_FILES} ${MASON_PREFIX}/${pkgconfig_file}"
+    done
+    echo pkg-config ${MASON_PKGCONFIG_FILES}
 }
 
 function mason_cflags {

diff --git a/third_party/mason/scripts/7z/9.20.1/.travis.yml b/third_party/mason/scripts/7z/9.20.1/.travis.yml
@@ -9,13 +9,6 @@ matrix:
     - os: linux
       compiler: clang
 
-env:
-  global:
-   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
-   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
-
-before_install:
-
 script:
 - ./mason build ${MASON_NAME} ${MASON_VERSION}
 

diff --git a/third_party/mason/scripts/afl/2.19b/.travis.yml b/third_party/mason/scripts/afl/2.19b/.travis.yml
@@ -1,13 +1,6 @@
 language: cpp
 sudo: false
 
-env:
-  global:
-   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
-   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
-
-before_install:
-
 script:
 - ./mason build ${MASON_NAME} ${MASON_VERSION}
 

diff --git a/third_party/mason/scripts/android-ndk/arm-9-r10e/.travis.yml b/third_party/mason/scripts/android-ndk/arm-9-r10e/.travis.yml
@@ -5,13 +5,6 @@ os:
   - linux
   - osx
 
-env:
-  global:
-   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
-   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
-
-before_install:
-
 script:
 - ./mason build ${MASON_NAME} ${MASON_VERSION}
 

diff --git a/third_party/mason/scripts/android-ndk/arm-9-r11c/.travis.yml b/third_party/mason/scripts/android-ndk/arm-9-r11c/.travis.yml
@@ -5,13 +5,6 @@ os:
   - linux
   - osx
 
-env:
-  global:
-   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
-   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
-
-before_install:
-
 script:
 - ./mason build ${MASON_NAME} ${MASON_VERSION}
 

diff --git a/third_party/mason/scripts/android-ndk/arm-9-r12b/.travis.yml b/third_party/mason/scripts/android-ndk/arm-9-r12b/.travis.yml
@@ -5,13 +5,6 @@ os:
   - linux
   - osx
 
-env:
-  global:
-   - secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
-   - secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
-
-before_install:
-
 script:
 - ./mason build ${MASON_NAME} ${MASON_VERSION}