Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: base/BUILD.gn

Issue 1180583002: GN updates to build base on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/process/BUILD.gn » ('j') | base/process/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index fea9027e4b3962a49035fac1da33170773630203..a62b4f67dba3b4b23e02c519d756fbc17cf89d23 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -11,6 +11,11 @@ if (is_android) {
config("base_implementation") {
defines = [ "BASE_IMPLEMENTATION" ]
+
+ if (is_ios) {
+ # base uses routines deprecated in iOS 8
+ cflags = [ "-Wno-deprecated-declarations" ]
Nico 2015/06/11 15:37:59 I don't see this in the gyp build files for base.
Chinmay 2015/06/11 17:44:35 The Sky builds set the target to 8.0 manually. Do
+ }
}
if (is_win) {
@@ -39,7 +44,7 @@ source_set("base_paths") {
"base_paths_win.h",
]
- if (is_android || is_mac) {
+ if (is_android || is_mac || is_ios) {
sources -= [ "base_paths_posix.cc" ]
}
@@ -764,12 +769,20 @@ component("base") {
}
# Mac.
- if (is_mac) {
+ if (is_mac || is_ios) {
+ # Common Desktop / iOS excludes
sources -= [
"native_library_posix.cc",
"strings/sys_string_conversions_posix.cc",
"threading/platform_thread_internal_posix.cc",
]
+
+ if (is_ios) {
+ sources -= [
+ "files/file_path_watcher_fsevents.cc",
+ "files/file_path_watcher_fsevents.h",
+ ]
Nico 2015/06/11 15:37:59 I thought the gn way was to not add these in the f
+ }
} else {
# Non-Mac.
sources -= [
@@ -814,6 +827,34 @@ component("base") {
}
}
+ # iOS
+ if (is_ios) {
+ set_sources_assignment_filter([])
eseidel 2015/06/10 21:42:44 This is slightly sad-panda. Would be nice to know
Chinmay 2015/06/10 21:45:27 By default, all "mac" specific files will get filt
Nico 2015/06/11 15:37:59 Since it's early for the ios gn build, it's probab
Chinmay 2015/06/11 17:44:35 In the GN system, "mac" files are not built by def
sdefresne 2015/06/11 17:54:32 According to build/filename_rules.gypi, we do not
+
+ sources += [
+ "base_paths_mac.h",
+ "base_paths_mac.mm",
+ "files/file_util_mac.mm",
+ "mac/bundle_locations.h",
+ "mac/bundle_locations.mm",
+ "mac/foundation_util.h",
+ "mac/foundation_util.mm",
+ "mac/mach_logging.cc",
+ "mac/mach_logging.h",
+ "mac/scoped_mach_port.cc",
+ "mac/scoped_mach_port.h",
+ "mac/scoped_nsautorelease_pool.h",
+ "mac/scoped_nsautorelease_pool.mm",
+ "message_loop/message_pump_mac.h",
+ "message_loop/message_pump_mac.mm",
+ "strings/sys_string_conversions_mac.mm",
+ "threading/platform_thread_mac.mm",
+ "time/time_mac.cc",
+ ]
+
+ set_sources_assignment_filter(sources_assignment_filter)
+ }
+
if (!use_glib) {
sources -= [
"message_loop/message_pump_glib.cc",
@@ -1340,8 +1381,6 @@ test("base_unittests") {
if (is_ios) {
sources -= [
"process/memory_unittest.cc",
- "process/memory_unittest_mac.h",
- "process/memory_unittest_mac.mm",
"process/process_unittest.cc",
"process/process_util_unittest.cc",
]
« no previous file with comments | « no previous file | base/process/BUILD.gn » ('j') | base/process/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698