diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2017-06-27 16:33:00 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-06-27 16:37:09 -0700 |
| commit | 50b999a8336d19400ab75aea66fe46eca2f5fe0b (patch) | |
| tree | 7cba4f4af6b131c253b65ff9f2923e851184668c /tensorflow/java/build_defs.bzl | |
| parent | d6d58a3a1785785679af56c0f8f131e7312b8226 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 160344052
Diffstat (limited to 'tensorflow/java/build_defs.bzl')
| -rw-r--r-- | tensorflow/java/build_defs.bzl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tensorflow/java/build_defs.bzl b/tensorflow/java/build_defs.bzl index 750d76301e..5bd5b9a388 100644 --- a/tensorflow/java/build_defs.bzl +++ b/tensorflow/java/build_defs.bzl @@ -1,5 +1,14 @@ # -*- Python -*- +# Pin to Java 1.7 to ensure broader compatibility for the Java bindings on +# Android. Note also that the android_library bazel rule currently enforces +# java 7 +# https://github.com/bazelbuild/bazel/blob/6c1106b1a721516d3b3db54d2e1c31b44a76fbb1/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java#L73 + +JAVA_VERSION_OPTS = [ + "-source 7 -target 7", +] + # A more robust set of lint and errorprone checks when building # Java source to improve code consistency. @@ -151,4 +160,4 @@ EP_DISABLED_CHECKS = [ EP_OPTS = EP_ENABLED_WARNINGS + EP_DISABLED_CHECKS -JAVACOPTS = XLINT_OPTS + EP_OPTS +JAVACOPTS = JAVA_VERSION_OPTS + XLINT_OPTS + EP_OPTS |