Bump the target API level to 22
This CL doesn't change anything except for incrementing the target API level to 22, that is Build.VERSION_CODES.LOLLIPOP_MR1 a.k.a. Android 5.1.
For Windows, Mac, Linux Desktop, and NaCl builds, literally this CL doesn't change anything.
For Android build, no behavior change is intended.
BUG=none
TEST=compile
git-svn-id: https://mozc.googlecode.com/svn/trunk@555 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/android/AndroidManifest_template.xml b/src/android/AndroidManifest_template.xml
index 29aba9a..8ad3594 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@">
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
<!-- Google Japanese Input (the main code) requires the following permissions. -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/src/android/resources/AndroidManifest.xml b/src/android/resources/AndroidManifest.xml
index cb53067..4e144e8 100644
--- a/src/android/resources/AndroidManifest.xml
+++ b/src/android/resources/AndroidManifest.xml
@@ -32,5 +32,5 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mozc.android.inputmethod.japanese.resources">
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
</manifest>
diff --git a/src/android/tests/AndroidManifest_template.xml b/src/android/tests/AndroidManifest_template.xml
index 827452f..6eb4c25 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"/>
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />
<!-- Google Japanese Input (the main code) requires the following permissions. -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/src/docker/ubuntu14.04/Dockerfile b/src/docker/ubuntu14.04/Dockerfile
index c10dc5c..d6d7670 100644
--- a/src/docker/ubuntu14.04/Dockerfile
+++ b/src/docker/ubuntu14.04/Dockerfile
@@ -55,12 +55,12 @@
## 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 d13d361..2fbc281 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.
