Index: base/BUILD.gn |
diff --git a/base/BUILD.gn b/base/BUILD.gn |
index 23cc60f08424a16bca266808706e8b3f8582d7ae..d948cd2caf7fdedbe0b8f8d336140a84fb791f1b 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" ] |
+ } |
} |
if (is_win) { |
@@ -807,6 +812,10 @@ component("base") { |
"files/file_path_watcher_fsevents.cc", |
"files/file_path_watcher_fsevents.h", |
] |
+ |
+ set_sources_assignment_filter([]) |
+ sources += [ "files/file_path_watcher_mac.cc" ] |
+ set_sources_assignment_filter(sources_assignment_filter) |
} |
} else { |
# Non-Mac. |
@@ -1316,7 +1325,6 @@ test("base_unittests") { |
"process/process_metrics_unittest_ios.cc", |
"process/process_unittest.cc", |
"process/process_util_unittest.cc", |
- "process/process_util_unittest_ios.cc", |
"profiler/stack_sampling_profiler_unittest.cc", |
"profiler/tracked_time_unittest.cc", |
"rand_util_unittest.cc", |
@@ -1456,7 +1464,7 @@ test("base_unittests") { |
"mac/foundation_util_unittest.mm", |
"mac/objc_property_releaser_unittest.mm", |
"mac/scoped_nsobject_unittest.mm", |
- "sys_string_conversions_mac_unittest.mm", |
+ "strings/sys_string_conversions_mac_unittest.mm", |
sdefresne
2015/07/25 19:15:29
It looks like this file is not build on iOS when u
Dirk Pranke
2015/07/31 21:27:40
this looks like it is pulled in to me:
https://co
sdefresne
2015/08/04 07:42:01
It isn't, because the regexp does not match the fi
|
] |
set_sources_assignment_filter(sources_assignment_filter) |