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

Merge "Unconditionally generate hash-based proguard mapping files" into main am: 46465666cc

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

Change-Id: I826e56a4f20739e0fc05f94ecddb68b6fc938309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-18 18:56:21 +00:00
committed by Automerger Merge Worker
parent 16542620eb 46465666cc
commit 92547162cd
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/dex.go
View File

@@ -315,15 +315,14 @@ 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 { }
if Bool(opt.Optimize) || Bool(opt.Obfuscate) {
// TODO(b/213833843): Allow configuration of the prefix via a build variable. // TODO(b/213833843): Allow configuration of the prefix via a build variable.
var sourceFilePrefix = "go/retraceme " var sourceFilePrefix = "go/retraceme "
var sourceFileTemplate = "\"" + sourceFilePrefix + "%MAP_ID\"" var sourceFileTemplate = "\"" + sourceFilePrefix + "%MAP_ID\""
// TODO(b/200967150): Also tag the source file in compat builds. r8Flags = append(r8Flags, "--map-id-template", "%MAP_HASH")
if Bool(opt.Optimize) || Bool(opt.Obfuscate) { r8Flags = append(r8Flags, "--source-file-template", sourceFileTemplate)
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.