summaryrefslogtreecommitdiff
path: root/build/art.go
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2024-04-15 17:51:55 +0000
committer Steven Moreland <smoreland@google.com> 2024-06-17 17:28:49 +0000
commitdad7f49b845c22e95d7dffd4a9e6545040a1cd66 (patch)
tree08cc553ddda2559ac1a11b94ed2b60ab14ab827c /build/art.go
parentc07cf2870545e13c4305f3abebd519380c0f6fcd (diff)
Always set page agnostic flag.
Two reasons: - consistent targets and art behavior - avoid test<->device coupling Bug: 310232825 Bug: 343776520 Test: many many tests leading up to this :) Change-Id: I69fffdaceb5ee05356329f3857b25eee977e6896
Diffstat (limited to 'build/art.go')
-rw-r--r--build/art.go11
1 files changed, 8 insertions, 3 deletions
diff --git a/build/art.go b/build/art.go
index 0e06c62979..51d4857ff6 100644
--- a/build/art.go
+++ b/build/art.go
@@ -107,9 +107,14 @@ func globalFlags(ctx android.LoadHookContext) ([]string, []string) {
"-DART_STACK_OVERFLOW_GAP_x86_64=8192")
}
- if ctx.Config().NoBionicPageSizeMacro() {
- cflags = append(cflags, "-DART_PAGE_SIZE_AGNOSTIC=1")
- }
+ // This was originally coupled to targets, with the no bionic page size
+ // macro. However, we want all devices to have the same layout for Art
+ // targets. This is important to share optimizations across devices as
+ // well as to make sure all test configurations are consistent (Android
+ // shares tests between targets, and tests built with this option will
+ // only work on devices with this option.
+ // Previously contingent on ctx.Config().NoBionicPageSizeMacro()
+ cflags = append(cflags, "-DART_PAGE_SIZE_AGNOSTIC=1")
if ctx.Config().IsEnvTrue("ART_ENABLE_ADDRESS_SANITIZER") {
// Used to enable full sanitization, i.e., user poisoning, under ASAN.