diff --git a/src/android/AndroidManifest_template.xml b/src/android/AndroidManifest_template.xml index 29aba9a31..8ad359469 100644 --- a/src/android/AndroidManifest_template.xml +++ b/src/android/AndroidManifest_template.xml @@ -33,7 +33,7 @@ package="@ANDROID_APPLICATION_ID@" android:versionCode="@ANDROID_VERSION_CODE@" android:versionName="@MAJOR@.@MINOR@.@BUILD@.@REVISION@-@ANDROID_ARCH@"> - + diff --git a/src/android/resources/AndroidManifest.xml b/src/android/resources/AndroidManifest.xml index cb53067f4..4e144e8a8 100644 --- a/src/android/resources/AndroidManifest.xml +++ b/src/android/resources/AndroidManifest.xml @@ -32,5 +32,5 @@ - + diff --git a/src/android/tests/AndroidManifest_template.xml b/src/android/tests/AndroidManifest_template.xml index 827452f8e..6eb4c25c3 100644 --- a/src/android/tests/AndroidManifest_template.xml +++ b/src/android/tests/AndroidManifest_template.xml @@ -57,7 +57,7 @@ android:targetPackage="@ANDROID_APPLICATION_ID@" android:label="Tests for org.mozc.android.inputmethod.japanese"/> - + diff --git a/src/docker/ubuntu14.04/Dockerfile b/src/docker/ubuntu14.04/Dockerfile index c10dc5c0b..d6d767071 100644 --- a/src/docker/ubuntu14.04/Dockerfile +++ b/src/docker/ubuntu14.04/Dockerfile @@ -55,12 +55,12 @@ WORKDIR /home/mozc_builder/work ## Android SDK/NDK RUN curl -L http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin -O && chmod u+x android-ndk-r10d-linux-x86_64.bin && ./android-ndk-r10d-linux-x86_64.bin && rm android-ndk-r10d-linux-x86_64.bin -RUN curl -L http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz | tar -zx +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-r10d 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-21 -RUN echo y | android update sdk --all --force --no-ui --filter build-tools-21.0.2 +RUN echo y | android update sdk --all --force --no-ui --filter android-22 +RUN echo y | android update sdk --all --force --no-ui --filter build-tools-22.0.0 RUN echo y | android update sdk --all --force --no-ui --filter extra-android-support RUN echo y | android update sdk --all --force --no-ui --filter platform-tool diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt index d13d3610a..2fbc28120 100644 --- a/src/mozc_version_template.txt +++ b/src/mozc_version_template.txt @@ -1,6 +1,6 @@ MAJOR=2 MINOR=16 -BUILD=2071 +BUILD=2072 REVISION=102 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be # downloaded by NaCl Mozc.