diff options
| author |  Yun Peng <pcloudy@google.com> | 2016-08-01 13:07:39 +0000 |
|---|---|---|
| committer | Yun Peng <pcloudy@google.com> | 2016-08-01 14:36:54 +0000 |
| commit | 7f421afc3a9acec567eec9a3269f68b9fe218b95 (patch) | |
| tree | 9ad41de83401492fa43c8cfafa0befbb7fbfb7fc /scripts/packages | |
| parent | c3743ac9bb72b571939c4a4e42119e46a20f598a (diff) | |
Add google-jdk as Bazel debian package dependency
--
Change-Id: I70c5707db557637894054c0ccec98999d043c7bf
Reviewed-on: https://bazel-review.googlesource.com/#/c/4220
MOS_MIGRATED_REVID=128979317
Diffstat (limited to 'scripts/packages')
| -rw-r--r-- | scripts/packages/BUILD | 2 | ||||
| -rw-r--r-- | scripts/packages/debian/control | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 2e97e8087e..ef3fe22f90 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -147,7 +147,7 @@ pkg_deb( "java7-jdk | java7-sdk", ], "//conditions:default": [ - "java8-jdk | java8-sdk", + "google-jdk | java8-jdk | java8-sdk", ], }) + [ "pkg-config", diff --git a/scripts/packages/debian/control b/scripts/packages/debian/control index e03e085b68..b48efcda20 100644 --- a/scripts/packages/debian/control +++ b/scripts/packages/debian/control @@ -9,7 +9,7 @@ Package: bazel Section: contrib/devel Priority: optional Architecture: amd64 -Depends: java8-jdk | java8-sdk, pkg-config, zip, g++, zlib1g-dev, +Depends: google-jdk | java8-jdk | java8-sdk, pkg-config, zip, g++, zlib1g-dev, unzip, bash-completion Conflicts: openjdk-9-jdk Description: Bazel is a tool that automates software builds and tests. |