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
Yohei Yukawa
6 years ago
| 43 | 43 |
- TARGET_PLATFORM=Android_arm64
|
| 44 | 44 |
- TARGET_PLATFORM=Android_x86
|
| 45 | 45 |
- TARGET_PLATFORM=Android_x86_64
|
| 46 | |
- TARGET_PLATFORM=Android_mips
|
| 47 | |
- TARGET_PLATFORM=Android_mips64
|
| 48 | 46 |
- TARGET_PLATFORM=Linux
|
| 49 | 47 |
- TARGET_PLATFORM=NaCl
|
| 50 | 48 |
- TARGET_PLATFORM=Mac
|
|
| 66 | 64 |
- if [ $TARGET_PLATFORM == Mac ]; then brew update && brew install qt5; fi
|
| 67 | 65 |
- 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
|
| 68 | 66 |
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then jdk_switcher use openjdk7; fi
|
| 69 | |
- 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
|
| 70 | |
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then export ANDROID_NDK_HOME=`pwd`/src/third_party/android-ndk-r12b ; fi
|
|
67 |
- 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
|
|
68 |
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then export ANDROID_NDK_HOME=`pwd`/src/third_party/android-ndk-r16b ; fi
|
| 71 | 69 |
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then export ANDROID_HOME=`pwd`/src/third_party/android-sdk-linux ; fi
|
| 72 | 70 |
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then export PATH="$PATH":${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_NDK_HOME}; fi
|
| 73 | 71 |
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then echo y | android update sdk --all --force --no-ui --filter android-22; fi
|
|
| 102 | 100 |
- os: osx
|
| 103 | 101 |
env: TARGET_PLATFORM=Android_x86_64
|
| 104 | 102 |
- os: osx
|
| 105 | |
env: TARGET_PLATFORM=Android_mips
|
| 106 | |
- os: osx
|
| 107 | |
env: TARGET_PLATFORM=Android_mips64
|
| 108 | |
- os: osx
|
| 109 | 103 |
env: TARGET_PLATFORM=Linux
|
| 110 | 104 |
- os: osx
|
| 111 | 105 |
env: TARGET_PLATFORM=NaCl
|
| 52 | 52 |
WORKDIR /home/mozc_builder/work
|
| 53 | 53 |
|
| 54 | 54 |
## Android SDK/NDK
|
| 55 | |
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
|
|
55 |
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
|
| 56 | 56 |
RUN curl -L http://dl.google.com/android/android-sdk_r24.1.2-linux.tgz | tar -zx
|
| 57 | |
ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r12b
|
|
57 |
ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r16b
|
| 58 | 58 |
ENV ANDROID_HOME /home/mozc_builder/work/android-sdk-linux
|
| 59 | 59 |
ENV PATH $PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_NDK_HOME}
|
| 60 | 60 |
RUN echo y | android update sdk --all --force --no-ui --filter android-22
|
| 29 | 29 |
|
| 30 | 30 |
MAJOR=2
|
| 31 | 31 |
MINOR=23
|
| 32 | |
BUILD=2779
|
|
32 |
BUILD=2780
|
| 33 | 33 |
REVISION=102
|
| 34 | 34 |
# This version represents the version of Mozc IME engine (converter, predictor,
|
| 35 | 35 |
# etc.). This version info is included both in the Mozc server and in the Mozc
|