summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2015-10-25 01:07:16 +1100
committerLeith Bade <leith@mapbox.com>2015-10-25 01:07:16 +1100
commit39911e581c7bc82116c1c70608f246924de33b85 (patch)
treea66716809ec61f742f1d1fbec5297a68504adfd2 /scripts
parentd2e01290ebc1f9b894b4b2d05e0e7c22d876e40b (diff)
downloadqtlocation-mapboxgl-39911e581c7bc82116c1c70608f246924de33b85.tar.gz
[android] Move android files
Fixes #2032
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 73ffc4c5ce..00a12d025f 100755
--- a/scripts/android/run.sh
+++ b/scripts/android/run.sh
@@ -15,8 +15,8 @@ export MASON_ANDROID_ABI=${ANDROID_ABI}
mapbox_time "checkout_styles" \
git submodule update --init styles
-mkdir -p ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw
-echo "${MAPBOX_ACCESS_TOKEN}" > ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
+mkdir -p ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw
+echo "${MAPBOX_ACCESS_TOKEN}" > ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
mapbox_time "compile_library" \
make android-lib HOST_VERSION=${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE}
@@ -38,7 +38,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/java/MapboxGLAndroidSDKTestApp/build/outputs/apk
+ APK_OUTPUTS=./android/MapboxGLAndroidSDKTestApp/build/outputs/apk
JNILIB=`mason env JNIDIR`
# ARM64 does not build APK for now