diff --git a/tensorflow/java/build_defs.bzl b/tensorflow/java/build_defs.bzl index 750d76301e5..5bd5b9a388f 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 diff --git a/tensorflow/java/maven/libtensorflow/pom.xml b/tensorflow/java/maven/libtensorflow/pom.xml index 91140478186..6d4c10f4caa 100644 --- a/tensorflow/java/maven/libtensorflow/pom.xml +++ b/tensorflow/java/maven/libtensorflow/pom.xml @@ -19,8 +19,8 @@ maven-compiler-plugin 3.6.1 - 1.8 - 1.8 + 1.7 + 1.7 diff --git a/tensorflow/java/maven/proto/pom.xml b/tensorflow/java/maven/proto/pom.xml index aa2a472f94f..1192cfe1c37 100644 --- a/tensorflow/java/maven/proto/pom.xml +++ b/tensorflow/java/maven/proto/pom.xml @@ -27,8 +27,8 @@ maven-compiler-plugin 3.6.1 - 1.8 - 1.8 + 1.7 + 1.7