Move android build to ec2

This commit is contained in:
Leith Bade
2014-12-26 11:08:11 +13:00
parent f2af329f2f
commit 2ad74d5fb0
7 changed files with 17 additions and 100 deletions

View File

@@ -3,87 +3,6 @@
set -e
set -o pipefail
if [[ "${MASON_PLATFORM}" == "android" ]]; then
if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
echo "load submodules"
git submodule update --init --recursive
echo "installing 7z"
MASON_PLATFORM= ./.mason/mason install 7z 9.20
echo "setting 7z path"
SEVEN_ZIP_PATH="$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za"
echo "fetching NDK"
wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin
echo "chmod NDK"
chmod a+x ./android-ndk-r10c-linux-x86_64.bin
echo "unpacking NDK"
$SEVEN_ZIP_PATH x ./android-ndk-r10c-linux-x86_64.bin > .tmp-ndk-log
rm .tmp-ndk-log
echo "fetching JDK"
wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u71-b14/jdk-7u71-linux-x64.tar.gz
echo "unpacking JDK"
tar -xzf ./jdk-7u71-linux-x64.tar.gz
echo "fetching SDK"
wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz
echo "unpacking SDK"
tar -xzf ./android-sdk_r23.0.2-linux.tgz
mv ./android-sdk-linux ./android-sdk
echo "installing SDK"
sudo apt-get update -y
sudo apt-get -y install lib32stdc++6 lib32z1
echo y | ./android-sdk/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.2,android-21,extra-android-m2repository,extra-google-m2repository
echo "inserting access token"
mkdir ./android/java/app/src/main/res/raw/
echo "${ANDROID_KEY}" >> ./android/java/app/src/main/res/raw/token.txt
elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
echo "installing 7z"
MASON_PLATFORM= ./.mason/mason install 7z 9.20
echo "setting 7z path"
SEVEN_ZIP_PATH="$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za"
echo "fetching NDK"
wget http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86_64.bin
echo "chmod NDK"
chmod a+x ./android-ndk-r10c-darwin-x86_64.bin
echo "unpacking NDK"
$SEVEN_ZIP_PATH x ./android-ndk-r10c-darwin-x86_64.bin > .tmp-ndk-log
rm .tmp-ndk-log
echo "fetching SDK"
wget http://dl.google.com/android/android-sdk_r23.0.2-macosx.zip
echo "unpacking SDK"
unzip -qq android-sdk_r23.0.2-macosx.zip
mv ./android-sdk-macosx ./android-sdk
echo "installing SDK"
echo y | ./android-sdk/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.2,android-21,extra-android-m2repository,extra-google-m2repository
echo "inserting access token"
mkdir ./android/java/app/src/main/res/raw/
echo "${ANDROID_KEY}" >> ./android/java/app/src/main/res/raw/token.txt
fi
fi
if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
#
# install Linux dependencies

View File

@@ -7,13 +7,14 @@ mapbox_time "checkout_styles" \
git submodule update --init styles
if [[ $MASON_PLATFORM == "android" ]]; then
mapbox_time "compile_program" \
make android BUILDTYPE=${BUILDTYPE}
#mapbox_time "compile_program" \
#make android BUILDTYPE=${BUILDTYPE}
./android/scrips/run-build.sh
if [[ $TESTMUNK == "yes" ]]; then
mapbox_time_start "upload_testmunk"
(cd ./android/test/ && ./upload_testmunk.sh ../java/app/build/outputs/apk/app-debug.apk)
mapbox_time_finish
#mapbox_time_start "upload_testmunk"
#(cd ./android/test/ && ./upload_testmunk.sh ../java/app/build/outputs/apk/app-debug.apk)
#mapbox_time_finish
fi
elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then