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

Side by Side Diff: base/BUILD.gn

Issue 1185963004: Revert of Sync Windows build flags between GYP and GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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') | 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 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 } 864 }
865 865
866 if (!use_glib) { 866 if (!use_glib) {
867 sources -= [ 867 sources -= [
868 "message_loop/message_pump_glib.cc", 868 "message_loop/message_pump_glib.cc",
869 "message_loop/message_pump_glib.h", 869 "message_loop/message_pump_glib.h",
870 ] 870 ]
871 } 871 }
872 872
873 configs += [ "//build/config/compiler:wexit_time_destructors" ] 873 configs += [ "//build/config/compiler:wexit_time_destructors" ]
874 if (!is_debug) { 874 if (is_android && !is_debug) {
875 configs -= [ "//build/config/compiler:optimize" ] 875 configs -= [ "//build/config/compiler:optimize" ]
876 configs += [ "//build/config/compiler:optimize_max" ] 876 configs += [ "//build/config/compiler:optimize_max" ]
877 } 877 }
878 878
879 allow_circular_includes_from = public_deps 879 allow_circular_includes_from = public_deps
880 } 880 }
881 881
882 # This is the subset of files from base that should not be used with a dynamic 882 # This is the subset of files from base that should not be used with a dynamic
883 # library. Note that this library cannot depend on base because base depends on 883 # library. Note that this library cannot depend on base because base depends on
884 # base_static. 884 # base_static.
885 source_set("base_static") { 885 source_set("base_static") {
886 sources = [ 886 sources = [
887 "base_switches.cc", 887 "base_switches.cc",
888 "base_switches.h", 888 "base_switches.h",
889 "win/pe_image.cc", 889 "win/pe_image.cc",
890 "win/pe_image.h", 890 "win/pe_image.h",
891 ] 891 ]
892 892
893 if (!is_debug) { 893 if (is_android && !is_debug) {
894 configs -= [ "//build/config/compiler:optimize" ] 894 configs -= [ "//build/config/compiler:optimize" ]
895 configs += [ "//build/config/compiler:optimize_max" ] 895 configs += [ "//build/config/compiler:optimize_max" ]
896 } 896 }
897 } 897 }
898 898
899 component("i18n") { 899 component("i18n") {
900 output_name = "base_i18n" 900 output_name = "base_i18n"
901 sources = [ 901 sources = [
902 "i18n/base_i18n_export.h", 902 "i18n/base_i18n_export.h",
903 "i18n/bidi_line_iterator.cc", 903 "i18n/bidi_line_iterator.cc",
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 "i18n/utf8_validator_tables.h", 936 "i18n/utf8_validator_tables.h",
937 ] 937 ]
938 defines = [ "BASE_I18N_IMPLEMENTATION" ] 938 defines = [ "BASE_I18N_IMPLEMENTATION" ]
939 configs += [ "//build/config/compiler:wexit_time_destructors" ] 939 configs += [ "//build/config/compiler:wexit_time_destructors" ]
940 deps = [ 940 deps = [
941 ":base", 941 ":base",
942 "//base/third_party/dynamic_annotations", 942 "//base/third_party/dynamic_annotations",
943 "//third_party/icu", 943 "//third_party/icu",
944 ] 944 ]
945 945
946 if (!is_debug) { 946 if (is_android && !is_debug) {
947 configs -= [ "//build/config/compiler:optimize" ] 947 configs -= [ "//build/config/compiler:optimize" ]
948 configs += [ "//build/config/compiler:optimize_max" ] 948 configs += [ "//build/config/compiler:optimize_max" ]
949 } 949 }
950 950
951 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 951 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
952 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 952 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
953 } 953 }
954 954
955 if (is_win || (is_linux && !is_chromeos)) { 955 if (is_win || (is_linux && !is_chromeos)) {
956 # TODO(GYP): Figure out which of these work and are needed on other platforms. 956 # TODO(GYP): Figure out which of these work and are needed on other platforms.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 "prefs/value_map_pref_store.h", 1048 "prefs/value_map_pref_store.h",
1049 "prefs/writeable_pref_store.h", 1049 "prefs/writeable_pref_store.h",
1050 ] 1050 ]
1051 1051
1052 defines = [ "BASE_PREFS_IMPLEMENTATION" ] 1052 defines = [ "BASE_PREFS_IMPLEMENTATION" ]
1053 1053
1054 deps = [ 1054 deps = [
1055 ":base", 1055 ":base",
1056 ] 1056 ]
1057 1057
1058 if (!is_debug) { 1058 if (is_android && !is_debug) {
1059 configs -= [ "//build/config/compiler:optimize" ] 1059 configs -= [ "//build/config/compiler:optimize" ]
1060 configs += [ "//build/config/compiler:optimize_max" ] 1060 configs += [ "//build/config/compiler:optimize_max" ]
1061 } 1061 }
1062 } 1062 }
1063 1063
1064 source_set("prefs_test_support") { 1064 source_set("prefs_test_support") {
1065 testonly = true 1065 testonly = true
1066 sources = [ 1066 sources = [
1067 "prefs/mock_pref_change_callback.cc", 1067 "prefs/mock_pref_change_callback.cc",
1068 "prefs/mock_pref_change_callback.h", 1068 "prefs/mock_pref_change_callback.h",
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1559 1559
1560 # GYP: //base.gyp:base_java_unittest_support 1560 # GYP: //base.gyp:base_java_unittest_support
1561 android_library("base_java_unittest_support") { 1561 android_library("base_java_unittest_support") {
1562 deps = [ 1562 deps = [
1563 ":base_java", 1563 ":base_java",
1564 ] 1564 ]
1565 java_files = 1565 java_files =
1566 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1566 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1567 } 1567 }
1568 } 1568 }
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698