Increase frame size for ASAN enabled builds.

This CL increases the frame size for builds where SANITIZE_TARGET is
non-empty from 6400 to 7400 (6400 was insufficient for ASAN and
coverage) to ensure that it builds successfully.

This was previously submitted as ag/1353693 for Android.common_build.mk,
but it looks like the frame size modifications have now moved to art.go
instead (found out from ag/1468464).

Bug: 30766843
Test: m test-art-host
Change-Id: If05defdcf93e2f6f7179941d95d8ee99c4c9a385

diff --git a/build/art.go b/build/art.go
index 0ae6c8f..b826538 100644 (file)
--- a/build/art.go
+++ b/build/art.go
@@ -91,7 +91,7 @@ func deviceFlags(ctx android.BaseContext) []string {
        var cflags []string
        deviceFrameSizeLimit := 1736
        if len(ctx.AConfig().SanitizeDevice()) > 0 {
-               deviceFrameSizeLimit = 6400
+               deviceFrameSizeLimit = 7400
        }
        cflags = append(cflags,
                fmt.Sprintf("-Wframe-larger-than=%d", deviceFrameSizeLimit),