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

Unified Diff: base/BUILD.gn

Issue 1250913002: patch from chinmaygarde@ to make progress on mac, ios. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to #341416 Created 5 years, 5 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 | « BUILD.gn ('k') | base/process/BUILD.gn » ('j') | build/config/features.gni » ('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 6eac22e4d04c628dcfcc8e36cd66c73faeda7420..7e67095bb5e9f65a8147622ec55f38105ee12c6b 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) {
@@ -810,6 +815,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" ]
brettw 2015/08/04 18:07:28 This also appears in https://codereview.chromium.o
Dirk Pranke 2015/08/04 18:27:15 Yeah, I need to merge things.
+ set_sources_assignment_filter(sources_assignment_filter)
}
} else {
# Non-Mac.
@@ -1319,7 +1328,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",
@@ -1459,7 +1467,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",
]
set_sources_assignment_filter(sources_assignment_filter)
« no previous file with comments | « BUILD.gn ('k') | base/process/BUILD.gn » ('j') | build/config/features.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698