diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 13:44:16 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 13:44:16 +0300 |
| commit | d2dc387b52beb40d2a079eda6ee051b34cae287b (patch) | |
| tree | afba9332b51388bbcc09e881a23e3e06c9e20e82 | |
| parent | 972f6abd45ee25ccc42e84b49d476b4c1a3249d6 (diff) | |
Set java6 as default after all, as that's what most builds require so far.
Change-Id: If2a8a0ec064d2d780e98c40b74d2a1c403c8191b
| -rwxr-xr-x | node/setup-build-android | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/node/setup-build-android b/node/setup-build-android index 10b4027..91ccc06 100755 --- a/node/setup-build-android +++ b/node/setup-build-android @@ -122,10 +122,10 @@ apt-get-retry install -y \ # libx11-dev \ # x11proto-core-dev \ -## set java-6-sun as default -#update-java-alternatives -s java-6-sun || true -# set java-7-openjdk as default ("java-7-openjdk-amd64" doesn't work here) -update-java-alternatives -s java-1.7.0-openjdk-amd64 || true +# set java-6-sun as default +update-java-alternatives -s java-6-sun || true +## set java-7-openjdk as default ("java-7-openjdk-amd64" doesn't work here) +#update-java-alternatives -s java-1.7.0-openjdk-amd64 || true adduser --system jenkins-build |