Merge "Add mapping id to source file information for R8 full-mode builds."
This commit is contained in:
commit
a52cbd67a3
1 changed files with 9 additions and 0 deletions
|
@ -254,6 +254,15 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8Fl
|
||||||
|
|
||||||
if BoolDefault(opt.Proguard_compatibility, true) {
|
if BoolDefault(opt.Proguard_compatibility, true) {
|
||||||
r8Flags = append(r8Flags, "--force-proguard-compatibility")
|
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.
|
// TODO(ccross): Don't shrink app instrumentation tests by default.
|
||||||
|
|
Loading…
Reference in a new issue