commit ced787401244b097366a3cda2d2e97ea24483781
author Ivan Vucica <ivucica@google.com> Tue Feb 23 15:43:17 2016 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Tue Feb 23 22:17:24 2016 +0000
tree a1a39312bef85b8ae474b5e8a3699197f34f4b7e
parent aa731afb731ffb2db0f33127dbe8ba649bf2888d

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

scripts/packages/BUILD

diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
index eb64410..2fba80f 100644
--- a/scripts/packages/BUILD
+++ b/scripts/packages/BUILD
@@ -128,10 +128,10 @@
     data = ":debian-data",
     depends = select({
         ":jdk7": [
-            "java7-jdk",
+            "java7-jdk | java7-sdk",
         ],
         "//conditions:default": [
-            "java8-jdk",
+            "java8-jdk | java8-sdk",
         ],
     }) + [
         "pkg-config",