Bump min SDK version to 10.9 and suppress deprecation warnings
This implies using a modern C++ library (libc++) which can use C++11
features we rely on for cross compiling to Android. This suppresses
deprecation warnings in base and skia as those libraries need to work
in environments that target a min sdk version of 10.6.
R=cstout@chromium.org, tonyg@chromium.org
Review URL: https://codereview.chromium.org/1318153005 .
diff --git a/BUILD.gn b/BUILD.gn
index a3e4bf8..6f8bbd0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -21,13 +21,12 @@
"//ui/events:events_unittests",
]
- if (!is_android) {
- deps += [ "//tools/xdisplaycheck" ]
- }
-
if (is_linux) {
- deps += [ "//sandbox/linux:sandbox" ]
- deps += [ "//sandbox/linux:sandbox_linux_unittests" ]
+ deps += [
+ "//sandbox/linux:sandbox",
+ "//sandbox/linux:sandbox_linux_unittests",
+ "//tools/xdisplaycheck",
+ ]
}
if (use_ozone) {
diff --git a/base/BUILD.gn b/base/BUILD.gn
index fea9027..38d5e0d 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -770,6 +770,11 @@
"strings/sys_string_conversions_posix.cc",
"threading/platform_thread_internal_posix.cc",
]
+
+ # We build with a 10.9 min sdk version but lots of code in this directory is
+ # written to target a 10.6 min sdk version and thus depends on declarations
+ # marked as deprecated on 10.9+. Suppress these warnings for now.
+ cflags = [ "-Wno-deprecated-declarations" ]
} else {
# Non-Mac.
sources -= [
diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn
index 9288add..47538c5 100644
--- a/build/config/mac/BUILD.gn
+++ b/build/config/mac/BUILD.gn
@@ -8,7 +8,7 @@
common_flags = [
"-isysroot",
sysroot,
- "-mmacosx-version-min=10.6",
+ "-mmacosx-version-min=10.9",
]
cflags = common_flags
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index c226044..994b89f 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -242,12 +242,14 @@
]
}
- if (is_ios) {
+ if (is_ios || is_mac) {
cflags = [
# Skia uses routines deprecated in iOS 7 and above
"-Wno-deprecated-declarations",
]
+ }
+ if (is_ios) {
libs = [ "ImageIO.framework" ]
}
}
