Use OpenJDK 7 to build Android binaries
With this CL, reference build environments defined as Docker containers start using OpenJDK 7 rather than OpenJDK 6 to build Android binaries.
No user visible behavior change is intended.
BUG=none
TEST=compile and unittest in Docker 1.3.1 running on Ubuntu 14.04
git-svn-id: https://mozc.googlecode.com/svn/trunk@369 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/docker/ubuntu12.04/Dockerfile b/src/docker/ubuntu12.04/Dockerfile
index a81ecde..46f3adb 100644
--- a/src/docker/ubuntu12.04/Dockerfile
+++ b/src/docker/ubuntu12.04/Dockerfile
@@ -38,9 +38,7 @@
## Packages for linux desktop version
RUN apt-get install -y libibus-1.0-dev libdbus-1-dev libglib2.0-dev subversion libqt4-dev libzinnia-dev tegaki-zinnia-japanese libgtk2.0-dev libxcb-xfixes0-dev
## Packages for Android
-### Use --no-install-recommends for locked down environment.
-### See https://github.com/dotcloud/docker/issues/963#issuecomment-41173568
-RUN apt-get install -y --no-install-recommends openjdk-6-jdk ant ia32-libs ia32-libs-multiarch
+RUN apt-get install -y --no-install-recommends openjdk-7-jdk openjdk-7-jre-headless ant ia32-libs ia32-libs-multiarch
## Packages for NaCl
RUN apt-get install -y libc6:i386 libstdc++6:i386 libstdc++6-4.4-dev
## For emacsian
diff --git a/src/docker/ubuntu14.04/Dockerfile b/src/docker/ubuntu14.04/Dockerfile
index e3544d2..acb8b78 100644
--- a/src/docker/ubuntu14.04/Dockerfile
+++ b/src/docker/ubuntu14.04/Dockerfile
@@ -39,7 +39,7 @@
## Packages for linux desktop version
RUN apt install -y libibus-1.0-dev libdbus-1-dev libglib2.0-dev subversion libqt4-dev libzinnia-dev tegaki-zinnia-japanese libgtk2.0-dev libxcb-xfixes0-dev
## Packages for Android
-RUN apt install -y ant openjdk-6-jdk libc6:i386 libstdc++6:i386 libncurses5:i386 zlib1g:i386
+RUN apt install -y --no-install-recommends openjdk-7-jdk openjdk-7-jre-headless ant libc6:i386 libstdc++6:i386 libncurses5:i386 zlib1g:i386
## Packages for NaCl
RUN apt install -y libc6:i386 libstdc++6:i386
## For emacsian
@@ -62,7 +62,6 @@
RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
# env setup
-ENV JAVA_HOME /usr/lib/jvm/java-6-openjdk-amd64
ENV ANDROID_NDK_HOME /home/mozc_builder/work/android-ndk-r10c
ENV ANDROID_HOME /home/mozc_builder/work/adt-bundle-linux-x86_64-20140321/sdk
ENV NACL_SDK_ROOT /home/mozc_builder/work/nacl_sdk/pepper_27
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index d81aaef..da1662f 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=1
MINOR=15
-BUILD=1912
+BUILD=1913
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
