Skip to content
Permalink
Browse files

Update Android NDK from r12b to r16b

This CL also drops MIPS/MIPS64 build configurations from Travis CI,
since NDK r16 deprecated those build targets [1].

 [1]: https://github.com/android-ndk/ndk/wiki/Changelog-r16

BUG=
TEST=compile
  • Loading branch information...
yukawa committed Dec 31, 2017
1 parent 6a47161 commit e24eb2f03e395f5b08bbb31079d721b3c2e82102
Showing with 5 additions and 11 deletions.
  1. +2 −8 .travis.yml
  2. +2 −2 docker/ubuntu14.04/Dockerfile
  3. +1 −1 src/data/version/mozc_version_template.bzl
@@ -44,8 +44,6 @@ env:
- TARGET_PLATFORM=Android_arm64
- TARGET_PLATFORM=Android_x86
- TARGET_PLATFORM=Android_x86_64
- TARGET_PLATFORM=Android_mips
- TARGET_PLATFORM=Android_mips64
- TARGET_PLATFORM=Linux
- TARGET_PLATFORM=NaCl
- TARGET_PLATFORM=Mac
@@ -67,8 +65,8 @@ install:
- if [ $TARGET_PLATFORM == Mac ]; then brew update && brew install qt5; fi
- if [ $TARGET_PLATFORM == NaCl ]; then cd src/third_party && curl -LO http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip && unzip nacl_sdk.zip && rm nacl_sdk.zip && cd nacl_sdk && ./naclsdk install pepper_49 && cd ../../../; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then jdk_switcher use openjdk7; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then cd src/third_party && curl -LO http://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip && unzip -q android-ndk-r12b-linux-x86_64.zip && rm android-ndk-r12b-linux-x86_64.zip && curl -L http://dl.google.com/android/android-sdk_r24.1.2-linux.tgz | tar -zx && cd ../../; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then export ANDROID_NDK_HOME=`pwd`/src/third_party/android-ndk-r12b ; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then cd src/third_party && curl -LO http://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip && unzip -q android-ndk-r16b-linux-x86_64.zip && rm android-ndk-r16b-linux-x86_64.zip && curl -L http://dl.google.com/android/android-sdk_r24.1.2-linux.tgz | tar -zx && cd ../../; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then export ANDROID_NDK_HOME=`pwd`/src/third_party/android-ndk-r16b ; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then export ANDROID_HOME=`pwd`/src/third_party/android-sdk-linux ; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then export PATH="$PATH":${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_NDK_HOME}; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then echo y | android update sdk --all --force --no-ui --filter android-22; fi
@@ -102,10 +100,6 @@ matrix:
env: TARGET_PLATFORM=Android_x86
- os: osx
env: TARGET_PLATFORM=Android_x86_64
- os: osx
env: TARGET_PLATFORM=Android_mips
- os: osx
env: TARGET_PLATFORM=Android_mips64
- os: osx
env: TARGET_PLATFORM=Linux
- os: osx
@@ -53,9 +53,9 @@ RUN mkdir -p /home/mozc_builder/work
WORKDIR /home/mozc_builder/work

## Android SDK/NDK
RUN curl -LO http://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip && unzip android-ndk-r12b-linux-x86_64.zip && rm android-ndk-r12b-linux-x86_64.zip
RUN curl -LO http://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip && unzip android-ndk-r16b-linux-x86_64.zip && rm android-ndk-r16b-linux-x86_64.zip
RUN curl -L http://dl.google.com/android/android-sdk_r24.1.2-linux.tgz | tar -zx
ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r12b
ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r16b
ENV ANDROID_HOME /home/mozc_builder/work/android-sdk-linux
ENV PATH $PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_NDK_HOME}
RUN echo y | android update sdk --all --force --no-ui --filter android-22
@@ -30,7 +30,7 @@

MAJOR=2
MINOR=23
BUILD=2779
BUILD=2780
REVISION=102
# This version represents the version of Mozc IME engine (converter, predictor,
# etc.). This version info is included both in the Mozc server and in the Mozc

0 comments on commit e24eb2f

Please sign in to comment.
You can’t perform that action at this time.