diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2011-07-05 17:51:17 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2011-07-05 17:51:17 +0300 |
| commit | 03ab45db1a15b5548060ab131c0cb88c49afd356 (patch) | |
| tree | bbbb0ed0c0f55faf9c02182edb5e0b2ce83a94d1 /node | |
| parent | 8acaea3e20a3744059060c4f8e3d7d65f67936e8 (diff) | |
Revert to known working java magic.
Diffstat (limited to 'node')
| -rwxr-xr-x | node/setup-build-android | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/node/setup-build-android b/node/setup-build-android index 9e49e27..4ebe63f 100755 --- a/node/setup-build-android +++ b/node/setup-build-android @@ -21,10 +21,7 @@ add-apt-repository "deb http://archive.canonical.com/ubuntu maverick partner" apt-get update export DEBIAN_FRONTEND=noninteractive -# Ok, we know that first attempt to install Java w/o accepting license will fail, -# so let's start with accepting it right away. -#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 +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) # set java-6-sun as default update-java-alternatives -s java-6-sun || true |