[android] Move into platform subdirectory

This commit is contained in:
John Firebaugh
2015-12-11 12:39:43 -08:00
parent 0db9f229f2
commit 13d5b18eba
227 changed files with 28 additions and 23 deletions

View File

@@ -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