Minimal fixes for OpenJDK 8
Changes to keep the cts build target and cts-tradefed working
under OpenJDK 8.
Bug: 23137868
Change-Id: I289bd35a1194224dbb49090d3701efcbe8f1f416
diff --git a/tools/tradefed-host/etc/cts-tradefed b/tools/tradefed-host/etc/cts-tradefed
index 5903454..3df2720 100755
--- a/tools/tradefed-host/etc/cts-tradefed
+++ b/tools/tradefed-host/etc/cts-tradefed
@@ -35,9 +35,9 @@
checkPath java
# check java version
-JAVA_VERSION=$(java -version 2>&1 | head -n 2 | grep '[ "]1\.[67][\. "$$]')
+JAVA_VERSION=$(java -version 2>&1 | head -n 2 | grep '[ "]1\.[678][\. "$$]')
if [ "${JAVA_VERSION}" == "" ]; then
- echo "Wrong java version. 1.6 or 1.7 is required."
+ echo "Wrong java version. 1.6, 1.7 or 1.8 is required."
exit
fi
diff --git a/tools/vm-tests-tf/src/util/build/JavacBuildStep.java b/tools/vm-tests-tf/src/util/build/JavacBuildStep.java
index d08a2c6..a07bb69 100644
--- a/tools/vm-tests-tf/src/util/build/JavacBuildStep.java
+++ b/tools/vm-tests-tf/src/util/build/JavacBuildStep.java
@@ -54,12 +54,16 @@
System.err.println("failed to create destination dir");
return false;
}
- int args = 4;
+ int args = 8;
String[] commandLine = new String[sourceFiles.size()+args];
commandLine[0] = "-classpath";
commandLine[1] = classPath;
commandLine[2] = "-d";
commandLine[3] = destPath;
+ commandLine[4] = "-source";
+ commandLine[5] = "1.7";
+ commandLine[6] = "-target";
+ commandLine[7] = "1.7";
String[] files = new String[sourceFiles.size()];
sourceFiles.toArray(files);
