aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Leon Scroggins III <scroggo@google.com>2017-10-17 15:27:12 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-10-17 21:15:20 +0000
commit53418dbb6af270d146890ec1904ce4b9c71e1eda (patch)
treebe9fb7e646336a4e6d552ff78f63998d960a64bd
parent119f6c85c1bdf33746393713f43363d2708123b0 (diff)
Remove "-Wno-over-aligned" from x86 Android builds
We now build without requiring disabling this warning. Came up in https://android-review.googlesource.com/498211 Bug: b/66996870 Change-Id: Ife596240507b3c055d2fabd08330828f8a5dbb9c Reviewed-on: https://skia-review.googlesource.com/60530 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Leon Scroggins <scroggo@google.com>
-rw-r--r--gn/BUILD.gn5
1 files changed, 2 insertions, 3 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index dd2884997d..db8f8345d2 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -308,9 +308,8 @@ config("warnings") {
"-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs' warnings.
]
- if ((target_cpu == "x86" && is_android) ||
- (target_cpu == "arm" && is_ios)) {
- # Clang seems to think new/malloc will only be 4-byte aligned on x86 Android and 32-bit iOS.
+ if (target_cpu == "arm" && is_ios) {
+ # Clang seems to think new/malloc will only be 4-byte aligned on 32-bit iOS.
# We're pretty sure it's actually 8-byte alignment.
cflags += [ "-Wno-over-aligned" ]
}