diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-05-12 11:51:46 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-05-12 11:51:46 -0400 |
| commit | 3034d9d7040f8cf3a845530d5000c7c37a55d22f (patch) | |
| tree | ac04c39f3ca83fc91225eb6305d641c4ae2eb8f0 /scripts/android | |
| parent | 106212158630c1fd15aec2225bcbb01268c8bae0 (diff) | |
| download | qtlocation-mapboxgl-3034d9d7040f8cf3a845530d5000c7c37a55d22f.tar.gz | |
Revert "Revert "Merge pull request #1429 from mapbox/travis-setup""
This reverts commit 3ccb0b5610a716b8c2bb602cc52f96bc2fb2ff03.
Conflicts:
.travis.yml
Diffstat (limited to 'scripts/android')
| -rwxr-xr-x | scripts/android/install.sh | 2 | ||||
| -rwxr-xr-x | scripts/android/run.sh | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/scripts/android/install.sh b/scripts/android/install.sh index 656465cf2f..fe2b816064 100755 --- a/scripts/android/install.sh +++ b/scripts/android/install.sh @@ -3,8 +3,6 @@ set -e set -o pipefail -source ./scripts/travis_helper.sh - mapbox_time "checkout_mason" \ git submodule update --init .mason diff --git a/scripts/android/run.sh b/scripts/android/run.sh index 7a909ffe3c..38749f79f5 100755 --- a/scripts/android/run.sh +++ b/scripts/android/run.sh @@ -9,8 +9,6 @@ export HOST=android export MASON_PLATFORM=android export MASON_ANDROID_ABI=${ANDROID_ABI:-arm-v7} -source ./scripts/travis_helper.sh - # Add Mason to PATH export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" |