tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add mapping id to source file information for R8 full-mode builds." am: a52cbd67a3 am: 587380225f am: 2a79ac7356 am: 9fef1137fa

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

Change-Id: I9be5ad895dfd07bbba6fd99aa5cc7934c97cb4b8
This commit is contained in:
Ian Zerny 2022-01-11 08:12:58 +00:00 committed by Automerger Merge Worker
commit c668a692dc
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
java/dex.go
View file

@ -254,6 +254,15 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8Fl
if BoolDefault(opt.Proguard_compatibility, true) {
r8Flags = append(r8Flags, "--force-proguard-compatibility")
} else {
// TODO(b/213833843): Allow configuration of the prefix via a build variable.
var sourceFilePrefix = "go/retraceme "
var sourceFileTemplate = "\"" + sourceFilePrefix + "%MAP_ID\""
// TODO(b/200967150): Also tag the source file in compat builds.
if Bool(opt.Optimize) || Bool(opt.Obfuscate) {
r8Flags = append(r8Flags, "--map-id-template", "%MAP_HASH")
r8Flags = append(r8Flags, "--source-file-template", sourceFileTemplate)
}
}
// TODO(ccross): Don't shrink app instrumentation tests by default.