diff options
| author | Milo Casagrande <milo.casagrande@linaro.org> | 2014-05-20 09:40:46 +0200 |
|---|---|---|
| committer | Milo Casagrande <milo.casagrande@linaro.org> | 2014-05-20 09:51:01 +0200 |
| commit | 77fde2622b0040eb6137353955f4029d0474da0b (patch) | |
| tree | 2ff97dc1d995737bc0fbd83f56f489ac6ef0c160 | |
| parent | 68f3c0400f0793585426a4f4aecb3f652e5c1c60 (diff) | |
Install openjdk-7 be default.
* AOSP now needs openjdk-7 to compile.
Change-Id: Ifc8828b64f20c02e605022aea5219e52cfb73905
| -rwxr-xr-x | node/setup-build-android | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/node/setup-build-android b/node/setup-build-android index 98e7356..b65061b 100755 --- a/node/setup-build-android +++ b/node/setup-build-android @@ -49,20 +49,7 @@ apt-get-retry --non-fatal update # add feature to allow add-apt-repository apt-get-retry install -y python-software-properties unixodbc java-common -# enable partner repo for sun-java6 -##add-apt-repository "deb http://archive.canonical.com/ubuntu maverick partner" -##apt-get update - -wget -nv --no-check-certificate http://android-build.linaro.org/seed/sun-java6-bin_6.26-2natty1_amd64.deb \ - http://android-build.linaro.org/seed/sun-java6-jdk_6.26-2natty1_amd64.deb \ - http://android-build.linaro.org/seed/sun-java6-jre_6.26-2natty1_all.deb - export DEBIAN_FRONTEND=noninteractive -##apt-get install -y sun-java6-jdk || (debconf 'echo SET shared/accepted-sun-dlj-v1-1 true' || true; apt-get install -f -y; apt-get install -y sun-java6-jdk) -dpkg -i sun-java6-* || (debconf 'echo SET shared/accepted-sun-dlj-v1-1 true' || true; apt-get install -f -y; dpkg -i sun-java6-*) - -# set java-6-sun as default -update-java-alternatives -s java-6-sun || true # Install basic development packages # Do not install toolchains and other variable stuff here @@ -109,7 +96,9 @@ apt-get-retry install -y \ lzop \ libxml2-utils \ subversion \ - libmpfr-dev + libmpfr-dev \ + openjdk-7-jdk \ + openjdk-7-jre # uuid-dev, acpica-tools are UEFI bootloader requirement |