Chromium Code Reviews| Index: base/BUILD.gn |
| diff --git a/base/BUILD.gn b/base/BUILD.gn |
| index 0d53aaabe60129123b9244adb74acd49fc2db913..1e61970206a970cfa9b03755df31c591ab22c38f 100644 |
| --- a/base/BUILD.gn |
| +++ b/base/BUILD.gn |
| @@ -3,6 +3,7 @@ |
| # found in the LICENSE file. |
| import("//build/config/compiler/compiler.gni") |
| +import("//build/config/nacl/config.gni") |
| import("//build/config/ui.gni") |
| import("//testing/test.gni") |
| @@ -681,9 +682,9 @@ component("base") { |
| public_deps = [ |
| ":base_paths", |
| "//base/debug", |
| + "//base/metrics", |
|
Dirk Pranke
2015/10/23 04:18:40
nit: re-sort this (not sure why it moved?)
Petr Hosek
2015/10/23 17:53:07
Done.
|
| "//base/json", |
| "//base/memory", |
| - "//base/metrics", |
| "//base/process", |
| "//base/trace_event", |
| ] |
| @@ -735,21 +736,33 @@ component("base") { |
| "cpu.cc", |
| "files/file_enumerator_posix.cc", |
| "files/file_proxy.cc", |
| - "files/file_util.cc", |
| - "files/file_util_posix.cc", |
| "files/file_util_proxy.cc", |
| "files/important_file_writer.cc", |
| "files/important_file_writer.h", |
| "files/scoped_temp_dir.cc", |
| - "message_loop/message_pump_libevent.cc", |
| "native_library_posix.cc", |
| "path_service.cc", |
| - "rand_util_posix.cc", |
| "scoped_native_library.cc", |
| "sync_socket_posix.cc", |
| "sys_info.cc", |
| "sys_info_posix.cc", |
| ] |
| + |
| + if (is_nacl_nonsfi) { |
| + set_sources_assignment_filter([]) |
| + sources += [ "posix/unix_domain_socket_linux.cc" ] |
| + set_sources_assignment_filter(sources_assignment_filter) |
| + sources -= [ "rand_util_nacl.cc" ] |
| + } else { |
| + sources -= [ |
| + "files/file_util.cc", |
| + "files/file_util.h", |
| + "files/file_util_posix.cc", |
| + "message_loop/message_pump_libevent.cc", |
| + "message_loop/message_pump_libevent.h", |
| + "rand_util_posix.cc", |
| + ] |
| + } |
| } else { |
| # Remove NaCl stuff. |
| sources -= [ |
| @@ -809,7 +822,7 @@ component("base") { |
| "setupapi.lib", |
| ] |
| all_dependent_configs = [ ":base_win_linker_flags" ] |
| - } else if (!is_nacl) { |
| + } else if (!is_nacl || is_nacl_nonsfi) { |
| # Non-Windows. |
| deps += [ "//third_party/libevent" ] |
| } |