summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Grandin <grandinp@gmail.com>2017-08-30 16:23:17 -0700
committerPierre Grandin <grandinp@gmail.com>2017-08-30 16:23:17 -0700
commit5dcfef4258f03becf74cde04cff6b345ef5ffd5d (patch)
tree60cc42dac3d76d0844824410c1686a7e0f0aac87
parentc42677946c1a0251dcb30adea7334b95d2e6f797 (diff)
downloadnavit-5dcfef4258f03becf74cde04cff6b345ef5ffd5d.tar.gz
Preparing the android ARM build for CI v2
-rw-r--r--.circleci/config.yml9
-rw-r--r--ci/build_android.sh8
-rw-r--r--ci/setup_android.sh31
3 files changed, 45 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 81196f16a..e73aa9e55 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,9 +18,16 @@ jobs:
steps:
- checkout
- run:
- name: Build for Android ARM
+ name: Setup common requirements
command: |
bash ci/setup_common_requirements.sh
+ - run:
+ name: Prepare the Android build environment
+ command: |
+ bash ci/setup_android.sh
+ - run:
+ name: Build for Android ARM
+ command: |
bash ci/build_android.sh
build_android_x86:
<<: *defaults
diff --git a/ci/build_android.sh b/ci/build_android.sh
index 537ff5b76..451b6176c 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -14,15 +14,19 @@ export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
export BUILD_PATH=$START_PATH"/android-${ARCH}"
+export ANDROID_SDK_HOME=/opt/android-sdk-linux
+export ANDROID_HOME=/opt/android-sdk-linux
+export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools
+
wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
[ -d ~/android-ndk-r11c ] || unzip -q -d ~ android-ndk-r11c-linux-x86_64.zip
[ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH
-cd $BUILD_PATH
+pushd $BUILD_PATH
android list targets
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 $SOURCE_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 ../
make -j $(nproc --all)
if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
diff --git a/ci/setup_android.sh b/ci/setup_android.sh
new file mode 100644
index 000000000..3f16b9cb0
--- /dev/null
+++ b/ci/setup_android.sh
@@ -0,0 +1,31 @@
+apt-get update && apt-get install -y openjdk-7-jdk wget expect git curl
+
+export ANDROID_SDK_HOME=/opt/android-sdk-linux
+export ANDROID_HOME=/opt/android-sdk-linux
+
+cd /opt && wget -q https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -O android-sdk.tgz
+cd /opt && tar -xvzf android-sdk.tgz
+cd /opt && rm -f android-sdk.tgz
+
+export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools
+
+echo y | android update sdk --no-ui --all --filter platform-tools | grep 'package installed'
+#RUN echo y | android update sdk --no-ui --all --filter extra-android-support | grep 'package installed'
+
+echo y | android update sdk --no-ui --all --filter android-25 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter android-24 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter android-23 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter android-18 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter android-16 | grep 'package installed'
+
+echo y | android update sdk --no-ui --all --filter build-tools-25.0.3 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-25.0.2 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-25.0.1 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-25.0.0 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-24.0.3 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-24.0.2 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-24.0.1 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-23.0.3 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-23.0.2 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-23.0.1 | grep 'package installed'
+