summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-12-11 12:39:43 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-12-16 14:52:29 -0800
commit13d5b18ebaeb330f05c4abfc04e0247222e038ba (patch)
tree90e24f1fb745581767b6979d1c562e60859cbcf6 /scripts
parent0db9f229f2bb14e2c6ccd3a8c0d0a30eb25ea5c5 (diff)
downloadqtlocation-mapboxgl-13d5b18ebaeb330f05c4abfc04e0247222e038ba.tar.gz
[android] Move into platform subdirectory
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/android/run.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/android/run.sh b/scripts/android/run.sh
index 9381edfeed..9e87298fe9 100755
--- a/scripts/android/run.sh
+++ b/scripts/android/run.sh
@@ -12,8 +12,8 @@ export MASON_ANDROID_ABI=${ANDROID_ABI}
# Build
################################################################################
-mkdir -p ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw
-echo "${MAPBOX_ACCESS_TOKEN}" > ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
+mkdir -p ./platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw
+echo "${MAPBOX_ACCESS_TOKEN}" > ./platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
mapbox_time "compile_library" \
make android-lib HOST_VERSION=${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE}
@@ -35,7 +35,7 @@ if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
echo "Deploying results..."
S3_PREFIX=s3://mapbox/mapbox-gl-native/android/build/${TRAVIS_JOB_NUMBER}
- APK_OUTPUTS=./android/MapboxGLAndroidSDKTestApp/build/outputs/apk
+ APK_OUTPUTS=./platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk
JNILIB=`mason env JNIDIR`
# ARM64 does not build APK for now