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

Commit 1d6eb687 authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

Use debug mode when running R8 for eng builds. 

Bug: 119601874
Test: Built for different variants.
Change-Id: I2250587eb3e457ca15265eb9f8359872e9b08363
parent a9e5a40b

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -581,6 +581,10 @@ func (c *config) Debuggable() bool { 
	return Bool(c.productVariables.Debuggable)

}



func (c *config) Eng() bool {

	return Bool(c.productVariables.Eng)

}



func (c *config) DevicePrefer32BitApps() bool {

	return Bool(c.productVariables.DevicePrefer32BitApps)

}

java/dex.go

+5 −0
Original line number Diff line number Diff line
@@ -160,6 +160,11 @@ func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8F 
	// TODO(ccross): if this is an instrumentation test of an obfuscated app, use the

	// dictionary of the app and move the app from libraryjars to injars.



	// Don't strip out debug information for eng builds.

	if ctx.Config().Eng() {

		r8Flags = append(r8Flags, "--debug")

	}



	return r8Flags, r8Deps

}