diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-20 13:58:08 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-04-20 14:23:56 +0000 |
| commit | 0ad9f5e33c845cd5e26ac34b80d3892cce84f710 (patch) | |
| tree | b48739f7e14dda53fa91a1ada79855730f7855f5 /scripts/packages | |
| parent | 01e7914245132a07ceb222eb21d1a015b701782d (diff) | |
Refactor JDK 7 build to use the vendored version of it
Along the path, fix the build for JDK 7 and get rid of
most ugliness in the JDK 7 build. Now simply setting
JAVA_VERSION to 1.7 will build a JDK 7 compatible version.
Fixes #1159.
--
Change-Id: I9599283844a57d9e053f12d37445907f22a9232e
Reviewed-on: https://bazel-review.googlesource.com/#/c/3452
MOS_MIGRATED_REVID=120332747
Diffstat (limited to 'scripts/packages')
| -rw-r--r-- | scripts/packages/BUILD | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 2fba80fed2..e2f5efef92 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -116,18 +116,13 @@ genrule( stamp = 1, ) -config_setting( - name = "jdk7", - values = {"define": "JAVA_VERSION=1.7"}, -) - pkg_deb( name = "bazel-debian", architecture = "amd64", built_using = "bazel (HEAD)", data = ":debian-data", depends = select({ - ":jdk7": [ + "//tools/jdk:jdk7": [ "java7-jdk | java7-sdk", ], "//conditions:default": [ |