| Index: base/BUILD.gn
|
| diff --git a/base/BUILD.gn b/base/BUILD.gn
|
| index da16ec3bdc35d8884619b8d76777d83c6771b493..7667c00a80fa54bb53cdddfd73553a9b3e4d93e5 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) {
|
| @@ -643,7 +648,6 @@ component("base") {
|
| ]
|
|
|
| if (is_ios) {
|
| - sources += [ "process/memory_stubs.cc" ]
|
| sources -= [
|
| "message_loop/message_pump_libevent.cc",
|
| "message_loop/message_pump_libevent.h",
|
| @@ -1466,6 +1470,8 @@ test("base_unittests") {
|
|
|
| if (is_ios) {
|
| sources -= [
|
| + "memory/discardable_shared_memory_unittest.cc",
|
| + "memory/shared_memory_unittest.cc",
|
| "process/memory_unittest.cc",
|
| "process/process_unittest.cc",
|
| "process/process_util_unittest.cc",
|
| @@ -1479,7 +1485,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)
|
|
|
| @@ -1500,7 +1506,7 @@ test("base_unittests") {
|
| sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
|
| }
|
|
|
| - if (is_posix || is_ios) {
|
| + if (is_posix && !is_ios) {
|
| sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
|
| deps += [ "//third_party/libevent" ]
|
| }
|
|
|