diff options
| author |  Andrew Jorgensen <andrew@andrewjorgensen.com> | 2016-01-14 10:14:20 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-01-15 09:21:59 +0000 |
| commit | d5b2d25c33500d1aa418566dd74758b8171ddef2 (patch) | |
| tree | d97795290c91ddd0d004713d3b671d769fcae24b /scripts | |
| parent | 980eebcbd35ab931bef3a365eb120ef8080c5d33 (diff) | |
Use general java jdk dependency for bazel debian package
Using java8-jdk will match both openjdk-8-jdk and oracle-java8-jdk similarly with java7-jdk. If
either of them are installed on the system allowing bazel to be installed in either case. Also the jdk source is not needed to create the bazel deb pacakge.
--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/785
MOS_MIGRATED_REVID=112132285
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/packages/BUILD | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 71a8e63a0e..d9f32b1ce6 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -167,12 +167,10 @@ pkg_deb( data = ":debian-data", depends = select({ ":jdk7": [ - "openjdk-7-jdk", - "openjdk-7-source", + "java7-jdk", ], "//conditions:default": [ - "openjdk-8-jdk", - "openjdk-8-source", + "java8-jdk", ], }) + [ "pkg-config", |