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

Side by Side Diff: base/BUILD.gn

Issue 1395573003: Build nacl_helper_nonsfi with GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup the compiler configuration Created 5 years, 2 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 | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')
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/compiler/compiler.gni") 5 import("//build/config/compiler/compiler.gni")
6 import("//build/config/nacl/config.gni")
6 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
7 import("//testing/test.gni") 8 import("//testing/test.gni")
8 9
9 if (is_android) { 10 if (is_android) {
10 import("//build/config/android/rules.gni") 11 import("//build/config/android/rules.gni")
11 } 12 }
12 13
13 config("base_implementation") { 14 config("base_implementation") {
14 defines = [ "BASE_IMPLEMENTATION" ] 15 defines = [ "BASE_IMPLEMENTATION" ]
15 } 16 }
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 deps = [ 675 deps = [
675 ":base_static", 676 ":base_static",
676 "//base/allocator:allocator_extension_thunks", 677 "//base/allocator:allocator_extension_thunks",
677 "//base/third_party/dynamic_annotations", 678 "//base/third_party/dynamic_annotations",
678 "//third_party/modp_b64", 679 "//third_party/modp_b64",
679 ] 680 ]
680 681
681 public_deps = [ 682 public_deps = [
682 ":base_paths", 683 ":base_paths",
683 "//base/debug", 684 "//base/debug",
685 "//base/metrics",
684 "//base/json", 686 "//base/json",
685 "//base/memory", 687 "//base/memory",
686 "//base/metrics",
687 "//base/process", 688 "//base/process",
688 "//base/trace_event", 689 "//base/trace_event",
689 ] 690 ]
690 691
691 # Allow more direct string conversions on platforms with native utf8 692 # Allow more direct string conversions on platforms with native utf8
692 # strings 693 # strings
693 if (is_mac || is_ios || is_chromeos) { 694 if (is_mac || is_ios || is_chromeos) {
694 defines = [ "SYSTEM_NATIVE_UTF8" ] 695 defines = [ "SYSTEM_NATIVE_UTF8" ]
695 } 696 }
696 697
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 "files/file_path_watcher_stub.cc", 729 "files/file_path_watcher_stub.cc",
729 "sync_socket_nacl.cc", 730 "sync_socket_nacl.cc",
730 "threading/platform_thread_linux.cc", 731 "threading/platform_thread_linux.cc",
731 ] 732 ]
732 set_sources_assignment_filter(sources_assignment_filter) 733 set_sources_assignment_filter(sources_assignment_filter)
733 734
734 sources -= [ 735 sources -= [
735 "cpu.cc", 736 "cpu.cc",
736 "files/file_enumerator_posix.cc", 737 "files/file_enumerator_posix.cc",
737 "files/file_proxy.cc", 738 "files/file_proxy.cc",
738 "files/file_util.cc",
739 "files/file_util_posix.cc",
740 "files/file_util_proxy.cc", 739 "files/file_util_proxy.cc",
741 "files/important_file_writer.cc", 740 "files/important_file_writer.cc",
742 "files/important_file_writer.h", 741 "files/important_file_writer.h",
743 "files/scoped_temp_dir.cc", 742 "files/scoped_temp_dir.cc",
744 "message_loop/message_pump_libevent.cc",
745 "native_library_posix.cc", 743 "native_library_posix.cc",
746 "path_service.cc", 744 "path_service.cc",
747 "rand_util_posix.cc",
748 "scoped_native_library.cc", 745 "scoped_native_library.cc",
749 "sync_socket_posix.cc", 746 "sync_socket_posix.cc",
750 "sys_info.cc", 747 "sys_info.cc",
751 "sys_info_posix.cc", 748 "sys_info_posix.cc",
752 ] 749 ]
750
751 if (is_nacl_nonsfi) {
752 set_sources_assignment_filter([])
753 sources += [
754 "posix/unix_domain_socket_linux.cc",
755 "process/kill_posix.cc",
Mark Seaborn 2015/10/22 21:48:30 Should this be handled in base/process/BUILD.gn in
Petr Hosek 2015/10/23 03:01:15 Done.
756 "process/launch.h",
757 "process/launch_posix.cc",
758 ]
759 set_sources_assignment_filter(sources_assignment_filter)
760 sources -= [ "rand_util_nacl.cc" ]
761 deps += [ "//third_party/libevent" ]
762 } else {
763 sources -= [
764 "files/file_util.cc",
765 "files/file_util.h",
766 "files/file_util_posix.cc",
767 "message_loop/message_pump_libevent.cc",
768 "message_loop/message_pump_libevent.h",
769 "rand_util_posix.cc",
770 ]
771 }
753 } else { 772 } else {
754 # Remove NaCl stuff. 773 # Remove NaCl stuff.
755 sources -= [ 774 sources -= [
756 "os_compat_nacl.cc", 775 "os_compat_nacl.cc",
757 "os_compat_nacl.h", 776 "os_compat_nacl.h",
758 "rand_util_nacl.cc", 777 "rand_util_nacl.cc",
759 ] 778 ]
760 } 779 }
761 780
762 # Windows. 781 # Windows.
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
1686 1705
1687 # GYP: //base.gyp:base_java_unittest_support 1706 # GYP: //base.gyp:base_java_unittest_support
1688 android_library("base_java_unittest_support") { 1707 android_library("base_java_unittest_support") {
1689 deps = [ 1708 deps = [
1690 ":base_java", 1709 ":base_java",
1691 ] 1710 ]
1692 java_files = 1711 java_files =
1693 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1712 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1694 } 1713 }
1695 } 1714 }
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698