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

Add mapping id to source file information for R8 full-mode builds.

Browse Source 
Bug: 204293621
Test: atest --host r8retrace-check-retraced-stacktrace
Change-Id: I09703cfaab72350efe67217be9e2d37988218f4d
This commit is contained in:
Ian Zerny
2021-11-02 15:37:06 +01:00
parent 789e5026b4
commit fc7df6124f
1 changed files with 9 additions and 0 deletions
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) { 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.