diff options
| author | Artem Serov <artem.serov@linaro.org> | 2018-02-15 19:15:01 +0000 |
|---|---|---|
| committer | Artem Serov <artem.serov@linaro.org> | 2018-02-16 14:10:01 +0000 |
| commit | 4a685f75db8a9668520d567ad6aa896507f2112b (patch) | |
| tree | 15c269793cf306876b8e289bd3c9aad64909c45f | |
| parent | d5b9628b48e24e56ab9e9c6affbcc6d41bd39fbf (diff) | |
| download | art-testing-4a685f75db8a9668520d567ad6aa896507f2112b.tar.gz | |
Update javac version and make it work with JDK9.
Test: ./test/test.py
Change-Id: I54f48d01022aede3ab26efa54450813cfc1ebe09
| -rwxr-xr-x | build.sh | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -21,7 +21,7 @@ DIR_ROOT=$SCRIPT_PATH DIR_BUILD=$DIR_ROOT/out/build DIR_BENCHMARKS=$DIR_ROOT/benchmarks DIR_FRAMEWORK=$DIR_ROOT/framework -JAVA_VERSION=1.7 +JAVA_VERSION=1.8 # Set to true to build for the target. @@ -164,7 +164,15 @@ JAVA_FRAMEWORK_FILES="$(find $DIR_FRAMEWORK -type f -name '*'.java)" verbose_safe rm -rf $DIR_BUILD verbose_safe mkdir -p $DIR_BUILD/classes/ -verbose_safe javac -encoding UTF-8 -target $JAVA_VERSION -source $JAVA_VERSION -cp $DIR_BENCHMARKS -cp $DIR_FRAMEWORK -d $DIR_BUILD/classes/ $JAVA_FRAMEWORK_FILES $JAVA_BENCHMARK_FILES + +JAVAC_RUNTIME_VERSION=$(javac -version 2>&1) +if [[ $JAVAC_RUNTIME_VERSION =~ "javac 9" ]]; then + CROSS_COMPILE_FLAGS="--release 8" +else + CROSS_COMPILE_FLAGS="-target $JAVA_VERSION -source $JAVA_VERSION" +fi + +verbose_safe javac -encoding UTF-8 $CROSS_COMPILE_FLAGS -cp $DIR_BENCHMARKS -cp $DIR_FRAMEWORK -d $DIR_BUILD/classes/ $JAVA_FRAMEWORK_FILES $JAVA_BENCHMARK_FILES verbose_safe jar cf $DIR_BUILD/bench.jar $DIR_BUILD/classes/ DX=$(which dx) if [ $TARGET_BUILD = "true" ] || [ -n "$DX" ]; then |