diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-05-05 15:54:57 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-05-07 15:50:46 -0400 |
| commit | 6b900791390a315d104446d9b29b096db03a8fcd (patch) | |
| tree | de9cb02ccb48be79c478ae1d5ffeac9de06316e2 /scripts/android | |
| parent | dcbf4940daa35994e3d4f73a130af9476274e745 (diff) | |
| download | qtlocation-mapboxgl-6b900791390a315d104446d9b29b096db03a8fcd.tar.gz | |
break out setup.sh from run.sh
chmod +x
drop travis_helper from android and ios
source travis_helper.sh before_install
only run setup.sh if file exists
explicitly local paths
explicit if statement in before_install
source setup.sh
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" |