1f52e93db2
With this change, setting the environment variable EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN=true switches from the OpenJDK 9 toolchain to the OpenJDK 11 one (prebuilts/jdk/jdk11). Since the version of the java.base module has to match the version of the jlink tool which consumes it, the --module-version argument to the jmod create call is also switched. Test: make Test: EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN make Bug: 131683177 Change-Id: I606d22538165f309fe5537bd67a26390b1dd5771
99 lines
3.4 KiB
Go
99 lines
3.4 KiB
Go
// Copyright 2017 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package config
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
func init() {
|
|
android.RegisterMakeVarsProvider(pctx, makeVarsProvider)
|
|
}
|
|
|
|
func makeVarsProvider(ctx android.MakeVarsContext) {
|
|
ctx.Strict("TARGET_DEFAULT_JAVA_LIBRARIES", strings.Join(DefaultLibraries, " "))
|
|
ctx.Strict("TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES", strings.Join(DefaultBootclasspathLibraries, " "))
|
|
ctx.Strict("DEFAULT_SYSTEM_MODULES", DefaultSystemModules)
|
|
|
|
if ctx.Config().TargetOpenJDK9() {
|
|
ctx.Strict("DEFAULT_JAVA_LANGUAGE_VERSION", "1.9")
|
|
} else {
|
|
ctx.Strict("DEFAULT_JAVA_LANGUAGE_VERSION", "1.8")
|
|
}
|
|
|
|
ctx.Strict("ANDROID_JAVA_HOME", "${JavaHome}")
|
|
ctx.Strict("ANDROID_JAVA8_HOME", "prebuilts/jdk/jdk8/${hostPrebuiltTag}")
|
|
ctx.Strict("ANDROID_JAVA9_HOME", "prebuilts/jdk/jdk9/${hostPrebuiltTag}")
|
|
ctx.Strict("ANDROID_JAVA11_HOME", "prebuilts/jdk/jdk11/${hostPrebuiltTag}")
|
|
ctx.Strict("ANDROID_JAVA_TOOLCHAIN", "${JavaToolchain}")
|
|
ctx.Strict("JAVA", "${JavaCmd} ${JavaVmFlags}")
|
|
ctx.Strict("JAVAC", "${JavacCmd} ${JavacVmFlags}")
|
|
ctx.Strict("JAR", "${JarCmd}")
|
|
ctx.Strict("JAR_ARGS", "${JarArgsCmd}")
|
|
ctx.Strict("JAVADOC", "${JavadocCmd}")
|
|
ctx.Strict("COMMON_JDK_FLAGS", "${CommonJdkFlags}")
|
|
|
|
ctx.Strict("DX", "${D8Cmd}")
|
|
ctx.Strict("DX_COMMAND", "${D8Cmd} -JXms16M -JXmx2048M")
|
|
ctx.Strict("R8_COMPAT_PROGUARD", "${R8Cmd}")
|
|
|
|
ctx.Strict("TURBINE", "${TurbineJar}")
|
|
|
|
if ctx.Config().RunErrorProne() {
|
|
ctx.Strict("ERROR_PRONE_JARS", strings.Join(ErrorProneClasspath, " "))
|
|
ctx.Strict("ERROR_PRONE_FLAGS", "${ErrorProneFlags}")
|
|
ctx.Strict("ERROR_PRONE_CHECKS", "${ErrorProneChecks}")
|
|
}
|
|
|
|
ctx.Strict("TARGET_JAVAC", "${JavacCmd} ${JavacVmFlags} ${CommonJdkFlags}")
|
|
ctx.Strict("HOST_JAVAC", "${JavacCmd} ${JavacVmFlags} ${CommonJdkFlags}")
|
|
|
|
ctx.Strict("JLINK", "${JlinkCmd}")
|
|
ctx.Strict("JMOD", "${JmodCmd}")
|
|
|
|
ctx.Strict("SOONG_JAVAC_WRAPPER", "${SoongJavacWrapper}")
|
|
ctx.Strict("DEXPREOPT_GEN", "${DexpreoptGen}")
|
|
ctx.Strict("ZIPSYNC", "${ZipSyncCmd}")
|
|
|
|
ctx.Strict("JACOCO_CLI_JAR", "${JacocoCLIJar}")
|
|
ctx.Strict("DEFAULT_JACOCO_EXCLUDE_FILTER", strings.Join(DefaultJacocoExcludeFilter, ","))
|
|
|
|
ctx.Strict("EXTRACT_JAR_PACKAGES", "${ExtractJarPackagesCmd}")
|
|
|
|
ctx.Strict("MANIFEST_CHECK", "${ManifestCheckCmd}")
|
|
ctx.Strict("MANIFEST_FIXER", "${ManifestFixerCmd}")
|
|
|
|
ctx.Strict("ANDROID_MANIFEST_MERGER", "${ManifestMergerCmd}")
|
|
|
|
ctx.Strict("CLASS2GREYLIST", "${Class2Greylist}")
|
|
ctx.Strict("HIDDENAPI", "${HiddenAPI}")
|
|
|
|
ctx.Strict("DEX_FLAGS", "${DexFlags}")
|
|
|
|
ctx.Strict("AIDL", "${AidlCmd}")
|
|
ctx.Strict("AAPT2", "${Aapt2Cmd}")
|
|
ctx.Strict("ZIPALIGN", "${ZipAlign}")
|
|
ctx.Strict("SIGNAPK_JAR", "${SignapkCmd}")
|
|
ctx.Strict("SIGNAPK_JNI_LIBRARY_PATH", "${SignapkJniLibrary}")
|
|
|
|
ctx.Strict("SOONG_ZIP", "${SoongZipCmd}")
|
|
ctx.Strict("MERGE_ZIPS", "${MergeZipsCmd}")
|
|
ctx.Strict("ZIP2ZIP", "${Zip2ZipCmd}")
|
|
|
|
ctx.Strict("ZIPTIME", "${Ziptime}")
|
|
|
|
}
|