diff options
Diffstat (limited to 'build/art.go')
| -rw-r--r-- | build/art.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/build/art.go b/build/art.go index b33b565899..f52c63525a 100644 --- a/build/art.go +++ b/build/art.go @@ -87,7 +87,7 @@ func globalFlags(ctx android.BaseContext) ([]string, []string) { "-DART_STACK_OVERFLOW_GAP_arm64=8192", "-DART_STACK_OVERFLOW_GAP_mips=16384", "-DART_STACK_OVERFLOW_GAP_mips64=16384", - "-DART_STACK_OVERFLOW_GAP_x86=12288", + "-DART_STACK_OVERFLOW_GAP_x86=16384", "-DART_STACK_OVERFLOW_GAP_x86_64=20480") } else { cflags = append(cflags, @@ -170,12 +170,23 @@ func globalDefaults(ctx android.LoadHookContext) { } Cflags []string Asflags []string + Sanitize struct { + Recover []string + } } p := &props{} p.Cflags, p.Asflags = globalFlags(ctx) p.Target.Android.Cflags = deviceFlags(ctx) p.Target.Host.Cflags = hostFlags(ctx) + + if envTrue(ctx, "ART_DEX_FILE_ACCESS_TRACKING") { + p.Cflags = append(p.Cflags, "-DART_DEX_FILE_ACCESS_TRACKING") + p.Sanitize.Recover = []string { + "address", + } + } + ctx.AppendProperties(p) } |