Always use OpenJDK9 for building
Remove support for compiling with javac from OpenJDK8. We still target 1.8 by default, and OpenJDK8 prebuilts are still required for the bootclasspath and running robolectric. Bug: 38418220 Test: m java Change-Id: I5686deb0ae4f9927192a039d08adc0117b2605dd
This commit is contained in:
@@ -61,10 +61,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
|
||||
ctx.Strict("TARGET_JAVAC", "${JavacCmd} ${CommonJdkFlags}")
|
||||
ctx.Strict("HOST_JAVAC", "${JavacCmd} ${CommonJdkFlags}")
|
||||
|
||||
if ctx.Config().UseOpenJDK9() {
|
||||
ctx.Strict("JLINK", "${JlinkCmd}")
|
||||
ctx.Strict("JMOD", "${JmodCmd}")
|
||||
}
|
||||
ctx.Strict("JLINK", "${JlinkCmd}")
|
||||
ctx.Strict("JMOD", "${JmodCmd}")
|
||||
|
||||
ctx.Strict("SOONG_JAVAC_WRAPPER", "${SoongJavacWrapper}")
|
||||
ctx.Strict("ZIPSYNC", "${ZipSyncCmd}")
|
||||
|
Reference in New Issue
Block a user