diff options
| author |  Thomas Broyer <t.broyer@ltgt.net> | 2017-07-10 15:29:17 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-07-10 17:44:37 +0200 |
| commit | d5930eae8660a1192c8235206f83c28c9bd471a1 (patch) | |
| tree | ef14921a0d84b21ac2b32a9c2ff6e98f6d626846 /scripts/packages | |
| parent | 45d1c3754883d002e9880644a63c0d07390465a5 (diff) | |
Allow Debian package to be installed alongside JDK 9
Update the documentation to instruct explicitly installing JDK 8.
Fixes #3147
Change-Id: If92ff93b095bead043c9b069e000b7afbc0abca0
PiperOrigin-RevId: 161387193
Diffstat (limited to 'scripts/packages')
| -rw-r--r-- | scripts/packages/debian/BUILD | 3 | ||||
| -rw-r--r-- | scripts/packages/debian/control | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/scripts/packages/debian/BUILD b/scripts/packages/debian/BUILD index 6048692034..4328f5a8d6 100644 --- a/scripts/packages/debian/BUILD +++ b/scripts/packages/debian/BUILD @@ -70,9 +70,6 @@ pkg_deb( name = "bazel-debian", architecture = "amd64", built_using = "bazel (HEAD)", - conflicts = [ - "openjdk-9-jdk", - ], data = ":debian-data", depends = select({ "//tools/jdk:jdk7": [ diff --git a/scripts/packages/debian/control b/scripts/packages/debian/control index 3253c5d22d..443240e5ca 100644 --- a/scripts/packages/debian/control +++ b/scripts/packages/debian/control @@ -10,7 +10,6 @@ Section: contrib/devel Priority: optional Architecture: amd64 Depends: google-jdk | java8-jdk | java8-sdk | oracle-java8-installer, g++, zlib1g-dev, bash-completion -Conflicts: openjdk-9-jdk Description: Bazel is a tool that automates software builds and tests. Supported build tasks include running compilers and linkers to produce executable programs and libraries, and assembling deployable packages |