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

Side by Side Diff: base/BUILD.gn

Issue 1227393002: Add data files for base and net. Move GN Python proto outputs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 5 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 | net/BUILD.gn » ('j') | net/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/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 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 "win/windows_version.h", 635 "win/windows_version.h",
636 "win/wrapped_window_proc.cc", 636 "win/wrapped_window_proc.cc",
637 "win/wrapped_window_proc.h", 637 "win/wrapped_window_proc.h",
638 ] 638 ]
639 639
640 sources -= [ 640 sources -= [
641 "sys_info_freebsd.cc", 641 "sys_info_freebsd.cc",
642 "sys_info_openbsd.cc", 642 "sys_info_openbsd.cc",
643 ] 643 ]
644 644
645 data = []
646
645 configs += [ ":base_implementation" ] 647 configs += [ ":base_implementation" ]
646 648
647 deps = [ 649 deps = [
648 ":base_static", 650 ":base_static",
649 "//base/allocator:allocator_extension_thunks", 651 "//base/allocator:allocator_extension_thunks",
650 "//base/third_party/dynamic_annotations", 652 "//base/third_party/dynamic_annotations",
651 "//third_party/modp_b64", 653 "//third_party/modp_b64",
652 ] 654 ]
653 655
654 public_deps = [ 656 public_deps = [
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 if (is_win) { 741 if (is_win) {
740 sources -= [ 742 sources -= [
741 "message_loop/message_pump_libevent.cc", 743 "message_loop/message_pump_libevent.cc",
742 "strings/string16.cc", 744 "strings/string16.cc",
743 745
744 # Not using sha1_win.cc because it may have caused a 746 # Not using sha1_win.cc because it may have caused a
745 # regression to page cycler moz. 747 # regression to page cycler moz.
746 "sha1_win.cc", 748 "sha1_win.cc",
747 ] 749 ]
748 750
751 # Required for base/stack_trace_win.cc to symbolize correctly.
752 data += [ "$root_build_dir/dbghelp.dll" ]
753
754 if (is_component_build) {
755 # Copy the VS runtime DLLs into the isolate so that they don't have to be
756 # preinstalled on the target machine. The debug runtimes have a "d" at
757 # the end.
758 if (is_debug) {
759 vcrt_suffix = "d"
760 } else {
761 vcrt_suffix = ""
762 }
763
764 # These runtime files are copied to the output directory by the
765 # vs_toolchain script that runs as part of toolchain configuration.
766 data += [
767 "$root_out_dir/msvcp120${vcrt_suffix}.dll",
768 "$root_out_dir/msvcr120${vcrt_suffix}.dll",
769 ]
770 if (is_asan) {
771 data += [ "//third_party/llvm-build/Release+Asserts/lib/clang/3.7.0/lib/ windows/clang_rt.asan_dynamic-i386.dll" ]
772 }
773 }
774
749 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 775 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
750 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 776 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
751 777
752 libs = [ 778 libs = [
753 "cfgmgr32.lib", 779 "cfgmgr32.lib",
754 "netapi32.lib", 780 "netapi32.lib",
755 "powrprof.lib", 781 "powrprof.lib",
756 "setupapi.lib", 782 "setupapi.lib",
757 ] 783 ]
758 all_dependent_configs = [ ":base_win_linker_flags" ] 784 all_dependent_configs = [ ":base_win_linker_flags" ]
759 } else if (!is_nacl) { 785 } else if (!is_nacl) {
760 # Non-Windows. 786 # Non-Windows.
761 deps += [ "//third_party/libevent" ] 787 deps += [ "//third_party/libevent" ]
762 } 788 }
763 789
764 # Mac. 790 # Mac.
765 if (is_mac || is_ios) { 791 if (is_mac || is_ios) {
766 # Common Desktop / iOS excludes 792 # Common Desktop / iOS excludes
767 sources -= [ 793 sources -= [
768 "native_library_posix.cc", 794 "native_library_posix.cc",
769 "strings/sys_string_conversions_posix.cc", 795 "strings/sys_string_conversions_posix.cc",
770 "threading/platform_thread_internal_posix.cc", 796 "threading/platform_thread_internal_posix.cc",
771 ] 797 ]
772 798
799 if (is_asan) {
800 # TODO(GYP) hook up asan on Mac. GYP has this extra dylib:
801 #data += [ "$root_out_dir/libclang_rt.asan_osx_dynamic.dylib" ]
802 }
803
773 if (is_ios) { 804 if (is_ios) {
774 sources -= [ 805 sources -= [
775 "files/file_path_watcher_fsevents.cc", 806 "files/file_path_watcher_fsevents.cc",
776 "files/file_path_watcher_fsevents.h", 807 "files/file_path_watcher_fsevents.h",
777 ] 808 ]
778 } 809 }
779 } else { 810 } else {
780 # Non-Mac. 811 # Non-Mac.
781 sources -= [ 812 sources -= [
782 "files/file_path_watcher_fsevents.cc", 813 "files/file_path_watcher_fsevents.cc",
783 "files/file_path_watcher_fsevents.h", 814 "files/file_path_watcher_fsevents.h",
784 "files/file_path_watcher_kqueue.cc", 815 "files/file_path_watcher_kqueue.cc",
785 "files/file_path_watcher_kqueue.h", 816 "files/file_path_watcher_kqueue.h",
786 ] 817 ]
787 } 818 }
788 819
789 # Linux. 820 # Linux.
790 if (is_linux) { 821 if (is_linux) {
822 if (is_asan || is_lsan || is_msan || is_tsan) {
823 # For llvm-sanitizer.
824 data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
825 }
826
791 # TODO(brettw) this will need to be parameterized at some point. 827 # TODO(brettw) this will need to be parameterized at some point.
792 linux_configs = [] 828 linux_configs = []
793 if (use_glib) { 829 if (use_glib) {
794 linux_configs += [ "//build/config/linux:glib" ] 830 linux_configs += [ "//build/config/linux:glib" ]
795 } 831 }
796 832
797 configs += linux_configs 833 configs += linux_configs
798 all_dependent_configs = linux_configs 834 all_dependent_configs = linux_configs
799 835
800 # These dependencies are not required on Android, and in the case 836 # These dependencies are not required on Android, and in the case
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 set_sources_assignment_filter(sources_assignment_filter) 896 set_sources_assignment_filter(sources_assignment_filter)
861 } 897 }
862 898
863 if (!use_glib) { 899 if (!use_glib) {
864 sources -= [ 900 sources -= [
865 "message_loop/message_pump_glib.cc", 901 "message_loop/message_pump_glib.cc",
866 "message_loop/message_pump_glib.h", 902 "message_loop/message_pump_glib.h",
867 ] 903 ]
868 } 904 }
869 905
906 if (is_asan || is_lsan || is_msan || is_tsan) {
907 data += [ "//tools/valgrind/asan/" ]
908 if (is_win) {
909 data += [ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer.ex e" ]
910 } else {
911 data += [ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer" ]
912 }
913 }
914
870 configs += [ "//build/config/compiler:wexit_time_destructors" ] 915 configs += [ "//build/config/compiler:wexit_time_destructors" ]
871 if (!is_debug) { 916 if (!is_debug) {
872 configs -= [ "//build/config/compiler:optimize" ] 917 configs -= [ "//build/config/compiler:optimize" ]
873 configs += [ "//build/config/compiler:optimize_max" ] 918 configs += [ "//build/config/compiler:optimize_max" ]
874 } 919 }
875 920
876 allow_circular_includes_from = public_deps 921 allow_circular_includes_from = public_deps
877 } 922 }
878 923
879 # This is the subset of files from base that should not be used with a dynamic 924 # This is the subset of files from base that should not be used with a dynamic
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 "//base/test:test_support", 1412 "//base/test:test_support",
1368 "//base/third_party/dynamic_annotations", 1413 "//base/third_party/dynamic_annotations",
1369 "//base/trace_event:trace_event_unittests", 1414 "//base/trace_event:trace_event_unittests",
1370 "//testing/gmock", 1415 "//testing/gmock",
1371 "//testing/gtest", 1416 "//testing/gtest",
1372 "//third_party/icu", 1417 "//third_party/icu",
1373 ] 1418 ]
1374 1419
1375 data = [ 1420 data = [
1376 "test/data/", 1421 "test/data/",
1377
1378 # TODO(dpranke): Remove when icu declares this directly.
1379 "$root_out_dir/icudtl.dat",
1380 ] 1422 ]
1423 if (is_linux || is_mac || is_win) {
1424 data += [ "//testing/test_env.py" ]
Dirk Pranke 2015/07/14 00:45:22 isn't this more a dependency of //base/test:test_s
1425 }
1381 1426
1382 # Allow more direct string conversions on platforms with native utf8 1427 # Allow more direct string conversions on platforms with native utf8
1383 # strings 1428 # strings
1384 if (is_mac || is_ios || is_chromeos) { 1429 if (is_mac || is_ios || is_chromeos) {
1385 defines = [ "SYSTEM_NATIVE_UTF8" ] 1430 defines = [ "SYSTEM_NATIVE_UTF8" ]
1386 } 1431 }
1387 1432
1388 if (is_android) { 1433 if (is_android) {
1389 apk_deps = [ 1434 apk_deps = [
1390 ":base_java", 1435 ":base_java",
1391 ":base_java_unittest_support", 1436 ":base_java_unittest_support",
1392 ] 1437 ]
1438 # TODO(brettw) I think this should not be here, we should not be using
1439 # isolate files.
Dirk Pranke 2015/07/14 00:45:22 We should probably discuss this at some point; it
1393 isolate_file = "base_unittests.isolate" 1440 isolate_file = "base_unittests.isolate"
1394 } 1441 }
1395 1442
1396 if (is_ios) { 1443 if (is_ios) {
1397 sources -= [ 1444 sources -= [
1398 "process/memory_unittest.cc", 1445 "process/memory_unittest.cc",
1399 "process/process_unittest.cc", 1446 "process/process_unittest.cc",
1400 "process/process_util_unittest.cc", 1447 "process/process_util_unittest.cc",
1401 ] 1448 ]
1402 1449
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 1483
1437 if (is_android) { 1484 if (is_android) {
1438 deps += [ "//testing/android/native_test:native_test_native_code" ] 1485 deps += [ "//testing/android/native_test:native_test_native_code" ]
1439 set_sources_assignment_filter([]) 1486 set_sources_assignment_filter([])
1440 sources += [ "debug/proc_maps_linux_unittest.cc" ] 1487 sources += [ "debug/proc_maps_linux_unittest.cc" ]
1441 set_sources_assignment_filter(sources_assignment_filter) 1488 set_sources_assignment_filter(sources_assignment_filter)
1442 } 1489 }
1443 1490
1444 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1491 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1445 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 1492 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
1493
1494 # Symbols for crashes when running tests on swarming.
1495 if (symbol_level > 0) {
1496 if (is_win) {
1497 data += [ "$root_out_dir/base_unittests.exe.pdb" ]
1498 } else if (is_mac) {
1499 data += [ "$root_out_dir/base_unittests.dSYM/" ]
1500 }
1501 }
1446 } 1502 }
1447 1503
1448 if (is_android) { 1504 if (is_android) {
1449 # GYP: //base.gyp:base_jni_headers 1505 # GYP: //base.gyp:base_jni_headers
1450 generate_jni("base_jni_headers") { 1506 generate_jni("base_jni_headers") {
1451 sources = [ 1507 sources = [
1452 "android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java", 1508 "android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java",
1453 "android/java/src/org/chromium/base/ApkAssets.java", 1509 "android/java/src/org/chromium/base/ApkAssets.java",
1454 "android/java/src/org/chromium/base/ApplicationStatus.java", 1510 "android/java/src/org/chromium/base/ApplicationStatus.java",
1455 "android/java/src/org/chromium/base/BuildInfo.java", 1511 "android/java/src/org/chromium/base/BuildInfo.java",
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 1621
1566 # GYP: //base.gyp:base_java_unittest_support 1622 # GYP: //base.gyp:base_java_unittest_support
1567 android_library("base_java_unittest_support") { 1623 android_library("base_java_unittest_support") {
1568 deps = [ 1624 deps = [
1569 ":base_java", 1625 ":base_java",
1570 ] 1626 ]
1571 java_files = 1627 java_files =
1572 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1628 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1573 } 1629 }
1574 } 1630 }
OLDNEW
« no previous file with comments | « no previous file | net/BUILD.gn » ('j') | net/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698