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

Side by Side Diff: chrome/test/BUILD.gn

Issue 874413003: Add targets for generating version files in Windows GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix issues after review, update GYP. 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 | « chrome/common_constants.gyp ('k') | chrome/tools/build/make_version_cc.py » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//build/module_args/v8.gni") 7 import("//build/module_args/v8.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 # This target exists to reference other test executables to bring these files 10 # This target exists to reference other test executables to bring these files
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 365
366 if (is_win) { 366 if (is_win) {
367 sources += rebase_path(gypi_values.chrome_interactive_ui_test_win_sources, 367 sources += rebase_path(gypi_values.chrome_interactive_ui_test_win_sources,
368 ".", 368 ".",
369 "//chrome") 369 "//chrome")
370 sources += [ 370 sources += [
371 # TODO: It would be nice to have these pulled in automatically from 371 # TODO: It would be nice to have these pulled in automatically from
372 # direct_dependent_settings in their various targets 372 # direct_dependent_settings in their various targets
373 # (net.gyp:net_resources, etc.), but that causes errors in other 373 # (net.gyp:net_resources, etc.), but that causes errors in other
374 # targets when resulting .res files get referenced multiple times. 374 # targets when resulting .res files get referenced multiple times.
375 #"$root_gen_dir/chrome_version/other_version.rc", TODO(GYP) what genera tes this? 375 "$root_gen_dir/chrome/other_version.rc",
376 "$root_gen_dir/ui/resources/ui_unscaled_resources.rc", 376 "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
377 ] 377 ]
378 deps += [ 378 deps += [
379 "//chrome:chrome_version_resources",
379 "//third_party/isimpledom", 380 "//third_party/isimpledom",
380 "//third_party/wtl", 381 "//third_party/wtl",
381 "//ui/resources", 382 "//ui/resources",
382
383 # 'chrome.gyp:chrome_version_resources' TODO(GYP)
384 ] 383 ]
385 } 384 }
386 385
387 if (is_mac) { 386 if (is_mac) {
388 datadeps = [ 387 datadeps = [
389 "//chrome", 388 "//chrome",
390 ] 389 ]
391 390
392 # TODO(mark): We really want this for all non-static library targets, but 391 # TODO(mark): We really want this for all non-static library targets, but
393 # when we tried to pull it up to the common.gypi level, it broke other 392 # when we tried to pull it up to the common.gypi level, it broke other
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 sources -= [ 832 sources -= [
834 "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_bro wsertest.cc", 833 "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_bro wsertest.cc",
835 "../browser/extensions/api/webrtc_logging_private/webrtc_logging_private _apitest.cc", 834 "../browser/extensions/api/webrtc_logging_private/webrtc_logging_private _apitest.cc",
836 "../browser/media/chrome_webrtc_browsertest.cc", 835 "../browser/media/chrome_webrtc_browsertest.cc",
837 "../browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc", 836 "../browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc",
838 "../browser/media/chrome_webrtc_getmediadevices_browsertest.cc", 837 "../browser/media/chrome_webrtc_getmediadevices_browsertest.cc",
839 ] 838 ]
840 } 839 }
841 if (is_win) { 840 if (is_win) {
842 sources += [ 841 sources += [
843 #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP ) 842 "$root_gen_dir/chrome/other_version.rc",
844 "$root_gen_dir/ui/resources/ui_unscaled_resources.rc", 843 "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
845 ] 844 ]
846 deps += [ 845 deps += [
847 #'chrome_version_resources', TODO(GYP) 846 "//chrome:chrome_version_resources",
848 "//third_party/wtl", 847 "//third_party/wtl",
849 "//ui/resources", 848 "//ui/resources",
850 ] 849 ]
851 } else { 850 } else {
852 sources -= [ 851 sources -= [
853 "../app/chrome_command_ids.h", 852 "../app/chrome_command_ids.h",
854 "../app/chrome_dll_resource.h", 853 "../app/chrome_dll_resource.h",
855 "../app/chrome_version.rc.version", 854 "../app/chrome_version.rc.version",
856 "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc ", 855 "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc ",
857 ] 856 ]
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 "../browser/sync/test/integration/single_client_dictionary_sync_test.cc" , 1064 "../browser/sync/test/integration/single_client_dictionary_sync_test.cc" ,
1066 "../browser/sync/test/integration/two_client_dictionary_sync_test.cc", 1065 "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
1067 ] 1066 ]
1068 1067
1069 # The sync_integration_tests do not run on mac without this flag. 1068 # The sync_integration_tests do not run on mac without this flag.
1070 # Search for comments about "xcode_settings" elsewhere in this file. 1069 # Search for comments about "xcode_settings" elsewhere in this file.
1071 ldflags = [ "-Wl,-ObjC" ] 1070 ldflags = [ "-Wl,-ObjC" ]
1072 } 1071 }
1073 if (is_win) { 1072 if (is_win) {
1074 sources += [ 1073 sources += [
1075 #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP ) 1074 "$root_gen_dir/chrome/other_version.rc",
1076 "$root_gen_dir/ui/resources/ui_unscaled_resources.rc", 1075 "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
1077 ] 1076 ]
1078 deps += [ 1077 deps += [
1078 "//chrome:chrome_version_resources",
1079 "//third_party/wtl", 1079 "//third_party/wtl",
1080 "//ui/resources", 1080 "//ui/resources",
1081
1082 #'chrome_version_resources', TODO(GYP)
1083 ] 1081 ]
1084 } else { 1082 } else {
1085 sources -= [ "../app/chrome_version.rc.version" ] 1083 sources -= [ "../app/chrome_version.rc.version" ]
1086 } 1084 }
1087 if (!is_chromeos) { 1085 if (!is_chromeos) {
1088 sources -= [ 1086 sources -= [
1089 "../browser/sync/test/integration/single_client_wifi_credentials_sync_te st.cc", 1087 "../browser/sync/test/integration/single_client_wifi_credentials_sync_te st.cc",
1090 "../browser/sync/test/integration/two_client_wifi_credentials_sync_test. cc", 1088 "../browser/sync/test/integration/two_client_wifi_credentials_sync_test. cc",
1091 ] 1089 ]
1092 } 1090 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 if (is_mac) { 1130 if (is_mac) {
1133 # Dictionary sync is disabled on Mac. 1131 # Dictionary sync is disabled on Mac.
1134 sources -= [ "../browser/sync/test/integration/performance/dictionary_sync _perf_test.cc" ] 1132 sources -= [ "../browser/sync/test/integration/performance/dictionary_sync _perf_test.cc" ]
1135 1133
1136 # The sync_performance_tests do not run on mac without this flag. 1134 # The sync_performance_tests do not run on mac without this flag.
1137 # Search for comments about "xcode_settings" elsewhere in this file. 1135 # Search for comments about "xcode_settings" elsewhere in this file.
1138 ldflags = [ "-Wl,-ObjC" ] 1136 ldflags = [ "-Wl,-ObjC" ]
1139 } 1137 }
1140 if (is_win) { 1138 if (is_win) {
1141 sources += [ 1139 sources += [
1142 #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP ) 1140 "$root_gen_dir/chrome/other_version.rc",
1143 "$root_gen_dir/ui/resources/ui_unscaled_resources.rc", 1141 "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
1144 ] 1142 ]
1145 deps += [ 1143 deps += [
1144 "//chrome:chrome_version_resources",
1146 "//third_party/wtl", 1145 "//third_party/wtl",
1147 "//ui/resources", 1146 "//ui/resources",
1148
1149 #'chrome_version_resources', TODO(GYP)
1150 ] 1147 ]
1151 } else { 1148 } else {
1152 sources -= [ "../app/chrome_version.rc.version" ] 1149 sources -= [ "../app/chrome_version.rc.version" ]
1153 } 1150 }
1154 1151
1155 if (toolkit_views) { 1152 if (toolkit_views) {
1156 deps += [ "//ui/views" ] 1153 deps += [ "//ui/views" ]
1157 } 1154 }
1158 } 1155 }
1159 1156
(...skipping 13 matching lines...) Expand all
1173 # TODO(GYP) CDM adapter stuff. 1170 # TODO(GYP) CDM adapter stuff.
1174 #if (enable_pepper_cdms) { 1171 #if (enable_pepper_cdms) {
1175 # deps += [ 1172 # deps += [
1176 # "//media/cdm/ppapi:clearkeycdmadapter", 1173 # "//media/cdm/ppapi:clearkeycdmadapter",
1177 # "//ppapi:ppapi_cpp", 1174 # "//ppapi:ppapi_cpp",
1178 # "//third_party/widevine/cdm:adapter", 1175 # "//third_party/widevine/cdm:adapter",
1179 # ] 1176 # ]
1180 #} 1177 #}
1181 } 1178 }
1182 } 1179 }
OLDNEW
« no previous file with comments | « chrome/common_constants.gyp ('k') | chrome/tools/build/make_version_cc.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698