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

Merge "Replace DEX_FLAGS by flags for D8 and R8." am: d5a57a5679

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059767

Change-Id: I43703b2d2fbbdfe5094c8d1a396789d985e61fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-04-28 13:12:18 +00:00
committed by Automerger Merge Worker
parent c58470bc37 d5a57a5679
commit 1b50e80f92
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/config/config.go
View File

@@ -68,6 +68,11 @@ var (
"-J-XX:+TieredCompilation", "-J-XX:+TieredCompilation",
"-J-XX:TieredStopAtLevel=1", "-J-XX:TieredStopAtLevel=1",
} }
dexerJavaVmFlagsList = []string{
`-JXX:OnError="cat hs_err_pid%p.log"`,
"-JXX:CICompilerCount=6",
"-JXX:+UseDynamicNumberOfGCThreads",
}
) )
func init() { func init() {
@@ -83,19 +88,14 @@ func init() {
// D8 invocations are shorter lived, so we restrict their JIT tiering relative to R8. // D8 invocations are shorter lived, so we restrict their JIT tiering relative to R8.
// Note that the `-JXX` prefix syntax is specific to the R8/D8 invocation wrappers. // Note that the `-JXX` prefix syntax is specific to the R8/D8 invocation wrappers.
exportedVars.ExportStringListStaticVariable("D8Flags", []string{ exportedVars.ExportStringListStaticVariable("D8Flags", append([]string{
`-JXX:OnError="cat hs_err_pid%p.log"`, "-JXmx2048M",
"-JXX:CICompilerCount=6",
"-JXX:+UseDynamicNumberOfGCThreads",
"-JXX:+TieredCompilation", "-JXX:+TieredCompilation",
"-JXX:TieredStopAtLevel=1", "-JXX:TieredStopAtLevel=1",
}) }, dexerJavaVmFlagsList...))
exportedVars.ExportStringListStaticVariable("R8Flags", append([]string{
exportedVars.ExportStringListStaticVariable("R8Flags", []string{ "-JXmx2048M",
`-JXX:OnError="cat hs_err_pid%p.log"`, }, dexerJavaVmFlagsList...))
"-JXX:CICompilerCount=6",
"-JXX:+UseDynamicNumberOfGCThreads",
})
exportedVars.ExportStringListStaticVariable("CommonJdkFlags", []string{ exportedVars.ExportStringListStaticVariable("CommonJdkFlags", []string{
`-Xmaxerrs 9999999`, `-Xmaxerrs 9999999`,

10
java/config/makevars.go
View File

@@ -43,9 +43,10 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("JAVADOC", "${JavadocCmd}") ctx.Strict("JAVADOC", "${JavadocCmd}")
ctx.Strict("COMMON_JDK_FLAGS", "${CommonJdkFlags}") ctx.Strict("COMMON_JDK_FLAGS", "${CommonJdkFlags}")
ctx.Strict("DX", "${D8Cmd}") ctx.Strict("D8", "${D8Cmd}")
ctx.Strict("DX_COMMAND", "${D8Cmd} -JXms16M -JXmx2048M") ctx.Strict("R8", "${R8Cmd}")
ctx.Strict("R8_COMPAT_PROGUARD", "${R8Cmd}") ctx.Strict("D8_COMMAND", "${D8Cmd} ${D8Flags}")
ctx.Strict("R8_COMMAND", "${R8Cmd} ${R8Flags}")
ctx.Strict("TURBINE", "${TurbineJar}") ctx.Strict("TURBINE", "${TurbineJar}")
@@ -78,9 +79,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("CLASS2NONSDKLIST", "${Class2NonSdkList}") ctx.Strict("CLASS2NONSDKLIST", "${Class2NonSdkList}")
ctx.Strict("HIDDENAPI", "${HiddenAPI}") ctx.Strict("HIDDENAPI", "${HiddenAPI}")
ctx.Strict("D8_FLAGS", "${D8Flags}")
ctx.Strict("R8_FLAGS", "${R8Flags}")
ctx.Strict("AIDL", "${AidlCmd}") ctx.Strict("AIDL", "${AidlCmd}")
ctx.Strict("AAPT2", "${Aapt2Cmd}") ctx.Strict("AAPT2", "${Aapt2Cmd}")
ctx.Strict("ZIPALIGN", "${ZipAlign}") ctx.Strict("ZIPALIGN", "${ZipAlign}")