StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I0d679648,I31542e7f am: 31d57588c9 am: 6414dde54e

Browse Source 
am: 176de85374

Change-Id: I06ce4efde1122b79b757cef2985ac4ecabad80a6
This commit is contained in:
Pete Gillin
2019-11-11 10:28:06 -08:00
committed by android-build-merger
parent 10314566b1 176de85374
commit 1209d7ebbc
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/config/config.go
View File

@@ -88,12 +88,10 @@ func init() {
return ctx.Config().Getenv("ANDROID_JAVA_HOME") return ctx.Config().Getenv("ANDROID_JAVA_HOME")
}) })
pctx.VariableFunc("JlinkVersion", func(ctx android.PackageVarContext) string { pctx.VariableFunc("JlinkVersion", func(ctx android.PackageVarContext) string {
switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN") { if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" {
case "false": return override
return "9"
default:
return "11"
} }
return "11"
}) })
pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin") pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin")

4
ui/build/config.go
View File

@@ -219,8 +219,8 @@ func NewConfig(ctx Context, args ...string) Config {
if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok { if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {
return override return override
} }
if toolchain9, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain9 == "false" { if toolchain11, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain11 != "true" {
return java9Home ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN is no longer supported. An OpenJDK 11 toolchain is now the global default.")
} }
return java11Home return java11Home
}() }()