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

Unified Diff: base/BUILD.gn

Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yet more feedback Created 5 years, 10 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/third_party/dynamic_annotations/BUILD.gn » ('j') | no next file with comments »
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 c413d540686a9c508960c29ac94a605bc969e93b..9dbc41c6f4fc23a07e653241c17f5292c781b599 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -764,7 +764,29 @@ component("base") {
]
if (is_nacl) {
- sources += [ "files/file_path_watcher_stub.cc" ]
+ # We reset sources_assignment_filter in order to explicitly include
+ # the linux file (which would otherwise be filtered out).
+ set_sources_assignment_filter([])
+ sources += [
+ "files/file_path_watcher_stub.cc",
+ "sync_socket_nacl.cc",
+ "threading/platform_thread_linux.cc",
+ ]
+ set_sources_assignment_filter(sources_assignment_filter)
+
+ sources -= [
+ "allocator/type_profiler_control.cc",
+ "allocator/type_profiler_control.h",
+ "async_socket_io_handler_posix.cc",
+ "base_paths.cc",
+ "cpu.cc",
+ "files/file_proxy.cc",
+ "files/file_util.cc",
+ "files/file_util_proxy.cc",
+ "path_service.cc",
+ "scoped_native_library.cc",
+ "files/scoped_temp_dir.cc",
+ ]
}
sources -= [
@@ -852,11 +874,12 @@ component("base") {
"process/launch_posix.cc",
"process/process_metrics_posix.cc",
"process/process_posix.cc",
+ "rand_util_posix.cc",
"sync_socket_posix.cc",
"sys_info_posix.cc",
]
} else {
- # Remove nacl stuff.
+ # Remove NaCl stuff.
sources -= [
"memory/shared_memory_nacl.cc",
"os_compat_nacl.cc",
« no previous file with comments | « no previous file | base/third_party/dynamic_annotations/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698