Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a52cbd67 authored by Ian Zerny's avatar Ian Zerny Committed by Gerrit Code Review
Browse files

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

parents 57271b9f fc7df612
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -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.