diff options
| author |  Ivan Vucica <ivucica@google.com> | 2016-02-23 15:43:17 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-02-23 22:17:24 +0000 |
| commit | ced787401244b097366a3cda2d2e97ea24483781 (patch) | |
| tree | a1a39312bef85b8ae474b5e8a3699197f34f4b7e /scripts/packages/BUILD | |
| parent | aa731afb731ffb2db0f33127dbe8ba649bf2888d (diff) | |
Aside from Debian dependency on java{7,8}-jdk, accept java{7,8}-sdk
It seems like the change introduced in pull request #785 does not
function universally. On some releases of Debian and Ubuntu, it looks
like packages are declared as providing java{7,8}-sdk.
Fixes #961.
--
MOS_MIGRATED_REVID=115338913
Diffstat (limited to 'scripts/packages/BUILD')
| -rw-r--r-- | scripts/packages/BUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index eb644106bb..2fba80fed2 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -128,10 +128,10 @@ pkg_deb( data = ":debian-data", depends = select({ ":jdk7": [ - "java7-jdk", + "java7-jdk | java7-sdk", ], "//conditions:default": [ - "java8-jdk", + "java8-jdk | java8-sdk", ], }) + [ "pkg-config", |