6db4d4e613
Pass -XX:+TieredCompilation -XX:TieredStopAtLevel=1 to the JVM to reduce the time spent JITing, which in local experiments reduced the CPU time of R8 while increasing the wall time, and reduced the total number of runnable threads. Without the new flags: $ time out/soong/host/linux-x86/bin/r8-compat-proguard -injars out/target/common/obj/APPS/Dialer_intermediates/classes.jar ... real 0m30.090s user 4m35.337s sys 0m12.853s With the new flags: $ time out/soong/host/linux-x86/bin/r8-compat-proguard -JXX:+TieredCompilation -JXX:TieredStopAtLevel=1 -injars out/target/common/obj/APPS/Dialer_intermediates/classes.jar ... real 0m35.674s user 2m45.135s sys 0m9.531s The increase in wall time should be offset by the better parallelism from the reduced CPU time. Bug: 119270658 Test: m checkbuild Change-Id: I8fc78b5ef1f8c6f51fd97a29461b96ae2b35cada
87 lines
3.0 KiB
Go
87 lines
3.0 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_JAVA_TOOLCHAIN", "${JavaToolchain}")
|
|
ctx.Strict("JAVA", "${JavaCmd}")
|
|
ctx.Strict("JAVAC", "${JavacCmd}")
|
|
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} ${CommonJdkFlags}")
|
|
ctx.Strict("HOST_JAVAC", "${JavacCmd} ${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_FIXER", "${ManifestFixerCmd}")
|
|
|
|
ctx.Strict("ANDROID_MANIFEST_MERGER_DEPS", "${ManifestMergerJars}")
|
|
ctx.Strict("ANDROID_MANIFEST_MERGER",
|
|
"${JavaCmd} -classpath ${ManifestMergerClasspath} com.android.manifmerger.Merger")
|
|
|
|
ctx.Strict("CLASS2GREYLIST", "${Class2Greylist}")
|
|
ctx.Strict("HIDDENAPI", "${HiddenAPI}")
|
|
|
|
ctx.Strict("DEX_FLAGS", "${DexFlags}")
|
|
}
|