diff options
| author | Colin Cross <ccross@android.com> | 2019-03-01 07:51:29 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-01 07:51:29 -0800 |
| commit | 148a568ad99a04e9e64ce806a868ea005738c1ec (patch) | |
| tree | 3648ccfd282291dded4aa744cdeb78cca1680fde /java | |
| parent | ba358c6c90213016e858c20539b08380f0335adb (diff) | |
| parent | e6c2c1313c41a746d7973ee0b633468b63f97328 (diff) | |
| download | build_soong-148a568ad99a04e9e64ce806a868ea005738c1ec.tar.gz build_soong-148a568ad99a04e9e64ce806a868ea005738c1ec.tar.bz2 build_soong-148a568ad99a04e9e64ce806a868ea005738c1ec.zip | |
Optimize CPU time when running d8 and r8 am: 6db4d4e613 am: f334ea833f
am: e6c2c1313c
Change-Id: I3a6b7ec5ca04250ec7e0e333ef64d9cfe6133553
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/config.go | 1 | ||||
| -rw-r--r-- | java/config/makevars.go | 2 | ||||
| -rw-r--r-- | java/dex.go | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/java/config/config.go b/java/config/config.go index 886916c2..1a8748c2 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -62,6 +62,7 @@ func init() { pctx.StaticVariable("JavacHeapSize", "2048M") pctx.StaticVariable("JavacHeapFlags", "-J-Xmx${JavacHeapSize}") + pctx.StaticVariable("DexFlags", "-JXX:+TieredCompilation -JXX:TieredStopAtLevel=1") pctx.StaticVariable("CommonJdkFlags", strings.Join([]string{ `-Xmaxerrs 9999999`, diff --git a/java/config/makevars.go b/java/config/makevars.go index 156ee263..30552da0 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -81,4 +81,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("CLASS2GREYLIST", "${Class2Greylist}") ctx.Strict("HIDDENAPI", "${HiddenAPI}") + + ctx.Strict("DEX_FLAGS", "${DexFlags}") } diff --git a/java/dex.go b/java/dex.go index 54b7bfcf..987129ee 100644 --- a/java/dex.go +++ b/java/dex.go @@ -25,7 +25,7 @@ import ( var d8 = pctx.AndroidStaticRule("d8", blueprint.RuleParams{ Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + - `${config.D8Cmd} --output $outDir $d8Flags $in && ` + + `${config.D8Cmd} ${config.DexFlags} --output $outDir $d8Flags $in && ` + `${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` + `${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`, CommandDeps: []string{ @@ -40,7 +40,7 @@ var r8 = pctx.AndroidStaticRule("r8", blueprint.RuleParams{ Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + `rm -f "$outDict" && ` + - `${config.R8Cmd} -injars $in --output $outDir ` + + `${config.R8Cmd} ${config.DexFlags} -injars $in --output $outDir ` + `--force-proguard-compatibility ` + `--no-data-resources ` + `-printmapping $outDict ` + |