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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | base/third_party/dynamic_annotations/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/rules.gni") 9 import("//build/config/android/rules.gni")
10 } 10 }
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 "win/startup_information.h", 757 "win/startup_information.h",
758 "win/win_util.cc", 758 "win/win_util.cc",
759 "win/win_util.h", 759 "win/win_util.h",
760 "win/windows_version.cc", 760 "win/windows_version.cc",
761 "win/windows_version.h", 761 "win/windows_version.h",
762 "win/wrapped_window_proc.cc", 762 "win/wrapped_window_proc.cc",
763 "win/wrapped_window_proc.h", 763 "win/wrapped_window_proc.h",
764 ] 764 ]
765 765
766 if (is_nacl) { 766 if (is_nacl) {
767 sources += [ "files/file_path_watcher_stub.cc" ] 767 # We reset sources_assignment_filter in order to explicitly include
768 # the linux file (which would otherwise be filtered out).
769 set_sources_assignment_filter([])
770 sources += [
771 "files/file_path_watcher_stub.cc",
772 "sync_socket_nacl.cc",
773 "threading/platform_thread_linux.cc",
774 ]
775 set_sources_assignment_filter(sources_assignment_filter)
776
777 sources -= [
778 "allocator/type_profiler_control.cc",
779 "allocator/type_profiler_control.h",
780 "async_socket_io_handler_posix.cc",
781 "base_paths.cc",
782 "cpu.cc",
783 "files/file_proxy.cc",
784 "files/file_util.cc",
785 "files/file_util_proxy.cc",
786 "path_service.cc",
787 "scoped_native_library.cc",
788 "files/scoped_temp_dir.cc",
789 ]
768 } 790 }
769 791
770 sources -= [ 792 sources -= [
771 "process/process_handle_freebsd.cc", 793 "process/process_handle_freebsd.cc",
772 "process/process_handle_openbsd.cc", 794 "process/process_handle_openbsd.cc",
773 "process/process_iterator_freebsd.cc", 795 "process/process_iterator_freebsd.cc",
774 "process/process_iterator_openbsd.cc", 796 "process/process_iterator_openbsd.cc",
775 "process/process_metrics_freebsd.cc", 797 "process/process_metrics_freebsd.cc",
776 "process/process_metrics_openbsd.cc", 798 "process/process_metrics_openbsd.cc",
777 "sys_info_freebsd.cc", 799 "sys_info_freebsd.cc",
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 "files/file_enumerator_posix.cc", 867 "files/file_enumerator_posix.cc",
846 "files/file_util_posix.cc", 868 "files/file_util_posix.cc",
847 "memory/shared_memory_posix.cc", 869 "memory/shared_memory_posix.cc",
848 "message_loop/message_pump_libevent.cc", 870 "message_loop/message_pump_libevent.cc",
849 "metrics/field_trial.cc", 871 "metrics/field_trial.cc",
850 "native_library_posix.cc", 872 "native_library_posix.cc",
851 "process/kill_posix.cc", 873 "process/kill_posix.cc",
852 "process/launch_posix.cc", 874 "process/launch_posix.cc",
853 "process/process_metrics_posix.cc", 875 "process/process_metrics_posix.cc",
854 "process/process_posix.cc", 876 "process/process_posix.cc",
877 "rand_util_posix.cc",
855 "sync_socket_posix.cc", 878 "sync_socket_posix.cc",
856 "sys_info_posix.cc", 879 "sys_info_posix.cc",
857 ] 880 ]
858 } else { 881 } else {
859 # Remove nacl stuff. 882 # Remove NaCl stuff.
860 sources -= [ 883 sources -= [
861 "memory/shared_memory_nacl.cc", 884 "memory/shared_memory_nacl.cc",
862 "os_compat_nacl.cc", 885 "os_compat_nacl.cc",
863 "os_compat_nacl.h", 886 "os_compat_nacl.h",
864 "rand_util_nacl.cc", 887 "rand_util_nacl.cc",
865 ] 888 ]
866 } 889 }
867 890
868 # Windows. 891 # Windows.
869 if (is_win) { 892 if (is_win) {
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
1568 1591
1569 # GYP: //base.gyp:base_java_unittest_support 1592 # GYP: //base.gyp:base_java_unittest_support
1570 android_library("base_java_unittest_support") { 1593 android_library("base_java_unittest_support") {
1571 deps = [ 1594 deps = [
1572 ":base_java", 1595 ":base_java",
1573 ] 1596 ]
1574 java_files = 1597 java_files =
1575 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1598 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1576 } 1599 }
1577 } 1600 }
OLDNEW
« 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