Revert "Remove java version checks"

This reverts commit c6f07f00da.

Change-Id: Ibcb52ce2aecf20ac741ed9beec27c2b4b07f8b66
This commit is contained in:
Colin Cross
2017-07-19 22:42:59 +00:00
parent c6f07f00da
commit 6650414087
3 changed files with 170 additions and 0 deletions

View File

@@ -114,6 +114,9 @@ func Build(ctx Context, config Config, what int) {
return
}
// Start getting java version as early as possible
getJavaVersions(ctx, config)
// Make sure that no other Soong process is running with the same output directory
buildLock := BecomeSingletonOrFail(ctx, config)
defer buildLock.Unlock()
@@ -145,6 +148,9 @@ func Build(ctx Context, config Config, what int) {
runSoong(ctx, config)
}
// Check the java versions we read earlier
checkJavaVersion(ctx, config)
if what&BuildKati != 0 {
// Run ckati
runKati(ctx, config)