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

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: update w/ review feedback from ncbray 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
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 738 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 "win/startup_information.h", 749 "win/startup_information.h",
750 "win/win_util.cc", 750 "win/win_util.cc",
751 "win/win_util.h", 751 "win/win_util.h",
752 "win/windows_version.cc", 752 "win/windows_version.cc",
753 "win/windows_version.h", 753 "win/windows_version.h",
754 "win/wrapped_window_proc.cc", 754 "win/wrapped_window_proc.cc",
755 "win/wrapped_window_proc.h", 755 "win/wrapped_window_proc.h",
756 ] 756 ]
757 757
758 if (is_nacl) { 758 if (is_nacl) {
759 sources += [ "files/file_path_watcher_stub.cc" ] 759 # We reset sources_assignment_filter in order to explicitly include
760 # the linux file (which would otherwise be filtered out).
761 set_sources_assignment_filter([])
762 sources += [
763 "files/file_path_watcher_stub.cc",
764 "sync_socket_nacl.cc",
765 "threading/platform_thread_linux.cc",
766 ]
767 set_sources_assignment_filter(sources_assignment_filter)
768
769 sources -= [
770 "allocator/type_profiler_control.cc",
771 "allocator/type_profiler_control.h",
772 "async_socket_io_handler_posix.cc",
773 "base_paths.cc",
774 "cpu.cc",
775 "files/file_proxy.cc",
776 "files/file_util.cc",
777 "files/file_util_proxy.cc",
778 "path_service.cc",
779 "scoped_native_library.cc",
780 "files/scoped_temp_dir.cc",
781 ]
760 } 782 }
761 783
762 sources -= [ 784 sources -= [
763 "process/process_handle_freebsd.cc", 785 "process/process_handle_freebsd.cc",
764 "process/process_handle_openbsd.cc", 786 "process/process_handle_openbsd.cc",
765 "process/process_iterator_freebsd.cc", 787 "process/process_iterator_freebsd.cc",
766 "process/process_iterator_openbsd.cc", 788 "process/process_iterator_openbsd.cc",
767 "process/process_metrics_freebsd.cc", 789 "process/process_metrics_freebsd.cc",
768 "process/process_metrics_openbsd.cc", 790 "process/process_metrics_openbsd.cc",
769 "sys_info_freebsd.cc", 791 "sys_info_freebsd.cc",
770 "sys_info_openbsd.cc", 792 "sys_info_openbsd.cc",
771 ] 793 ]
772 794
773 defines = [ "BASE_IMPLEMENTATION" ] 795 defines = [ "BASE_IMPLEMENTATION" ]
774 796
775 deps = [ 797 deps = [
776 ":base_static", 798 ":base_static",
777 "//base/allocator:allocator_extension_thunks", 799 "//base/allocator:allocator_extension_thunks",
778 "//base/third_party/dynamic_annotations",
779 "//base/third_party/nspr", 800 "//base/third_party/nspr",
780 "//third_party/modp_b64", 801 "//third_party/modp_b64",
781 ] 802 ]
782 803
804 if (!is_nacl) {
805 deps += [ "//base/third_party/dynamic_annotations" ]
806 }
807
783 # Allow more direct string conversions on platforms with native utf8 808 # Allow more direct string conversions on platforms with native utf8
784 # strings 809 # strings
785 if (is_mac || is_ios || is_chromeos) { 810 if (is_mac || is_ios || is_chromeos) {
786 defines += [ "SYSTEM_NATIVE_UTF8" ] 811 defines += [ "SYSTEM_NATIVE_UTF8" ]
787 } 812 }
788 813
789 if (is_android) { 814 if (is_android) {
790 sources += [ 815 sources += [
791 "memory/discardable_memory_ashmem_allocator.cc", 816 "memory/discardable_memory_ashmem_allocator.cc",
792 "memory/discardable_memory_ashmem_allocator.h", 817 "memory/discardable_memory_ashmem_allocator.h",
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 sources -= [ "power_monitor/power_monitor_device_source_posix.cc" ] 854 sources -= [ "power_monitor/power_monitor_device_source_posix.cc" ]
830 } 855 }
831 856
832 if (is_nacl) { 857 if (is_nacl) {
833 # These things would otherwise be built on a Posix build but aren't 858 # These things would otherwise be built on a Posix build but aren't
834 # supported on NaCl. 859 # supported on NaCl.
835 sources -= [ 860 sources -= [
836 "debug/stack_trace_posix.cc", 861 "debug/stack_trace_posix.cc",
837 "files/file_enumerator_posix.cc", 862 "files/file_enumerator_posix.cc",
838 "files/file_util_posix.cc", 863 "files/file_util_posix.cc",
864 "memory/shared_memory_posix.cc",
839 "message_loop/message_pump_libevent.cc", 865 "message_loop/message_pump_libevent.cc",
866 "metrics/field_trial.cc",
867 "native_library_posix.cc",
840 "process/kill_posix.cc", 868 "process/kill_posix.cc",
841 "process/launch_posix.cc", 869 "process/launch_posix.cc",
842 "process/process_metrics_posix.cc", 870 "process/process_metrics_posix.cc",
843 "process/process_posix.cc", 871 "process/process_posix.cc",
844 "metrics/field_trial.cc", 872 "rand_util_posix.cc",
845 "native_library_posix.cc",
846 "memory/shared_memory_posix.cc",
847 "sync_socket_posix.cc", 873 "sync_socket_posix.cc",
848 "sys_info_posix.cc", 874 "sys_info_posix.cc",
849 ] 875 ]
850 } else { 876 } else {
851 # Remove nacl stuff. 877 # Remove nacl stuff.
852 sources -= [ 878 sources -= [
853 "os_compat_nacl.cc", 879 "os_compat_nacl.cc",
854 "os_compat_nacl.h", 880 "os_compat_nacl.h",
855 "rand_util_nacl.cc", 881 "rand_util_nacl.cc",
856 "memory/shared_memory_nacl.cc", 882 "memory/shared_memory_nacl.cc",
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
1012 "i18n/time_formatting.h", 1038 "i18n/time_formatting.h",
1013 "i18n/timezone.cc", 1039 "i18n/timezone.cc",
1014 "i18n/timezone.h", 1040 "i18n/timezone.h",
1015 "i18n/utf8_validator_tables.cc", 1041 "i18n/utf8_validator_tables.cc",
1016 "i18n/utf8_validator_tables.h", 1042 "i18n/utf8_validator_tables.h",
1017 ] 1043 ]
1018 defines = [ "BASE_I18N_IMPLEMENTATION" ] 1044 defines = [ "BASE_I18N_IMPLEMENTATION" ]
1019 configs += [ "//build/config/compiler:wexit_time_destructors" ] 1045 configs += [ "//build/config/compiler:wexit_time_destructors" ]
1020 deps = [ 1046 deps = [
1021 ":base", 1047 ":base",
1022 "//base/third_party/dynamic_annotations",
1023 "//third_party/icu", 1048 "//third_party/icu",
1024 ] 1049 ]
1025 1050
1051 if (!is_nacl) {
1052 deps += [ "//base/third_party/dynamic_annotations" ]
1053 }
1054
1026 if (is_android && !is_debug) { 1055 if (is_android && !is_debug) {
1027 configs -= [ "//build/config/compiler:optimize" ] 1056 configs -= [ "//build/config/compiler:optimize" ]
1028 configs += [ "//build/config/compiler:optimize_max" ] 1057 configs += [ "//build/config/compiler:optimize_max" ]
1029 } 1058 }
1030 1059
1031 if (is_win) { 1060 if (is_win) {
1032 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1061 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1033 cflags = [ "/wd4267" ] 1062 cflags = [ "/wd4267" ]
1034 } 1063 }
1035 } 1064 }
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1534 1563
1535 # GYP: //base.gyp:base_java_unittest_support 1564 # GYP: //base.gyp:base_java_unittest_support
1536 android_library("base_java_unittest_support") { 1565 android_library("base_java_unittest_support") {
1537 deps = [ 1566 deps = [
1538 ":base_java", 1567 ":base_java",
1539 ] 1568 ]
1540 java_files = 1569 java_files =
1541 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1570 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1542 } 1571 }
1543 } 1572 }
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | build/config/BUILDCONFIG.gn » ('j') | chrome/test/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698