| OLD | NEW |
| 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 # HOW TO WRITE CONDITIONALS IN THIS FILE | 5 # HOW TO WRITE CONDITIONALS IN THIS FILE |
| 6 # ====================================== | 6 # ====================================== |
| 7 # | 7 # |
| 8 # In many other places, one would write a conditional that expresses all the | 8 # In many other places, one would write a conditional that expresses all the |
| 9 # cases when a source file is used or unused, and then either add or subtract | 9 # cases when a source file is used or unused, and then either add or subtract |
| 10 # it from the sources list in that case | 10 # it from the sources list in that case |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 if (is_win) { | 58 if (is_win) { |
| 59 # This is in a separate config so the flags can be applied to dependents. | 59 # This is in a separate config so the flags can be applied to dependents. |
| 60 # ldflags in GN aren't automatically inherited. | 60 # ldflags in GN aren't automatically inherited. |
| 61 config("base_win_linker_flags") { | 61 config("base_win_linker_flags") { |
| 62 ldflags = [ | 62 ldflags = [ |
| 63 "/DELAYLOAD:cfgmgr32.dll", | 63 "/DELAYLOAD:cfgmgr32.dll", |
| 64 "/DELAYLOAD:powrprof.dll", | 64 "/DELAYLOAD:powrprof.dll", |
| 65 "/DELAYLOAD:setupapi.dll", | 65 "/DELAYLOAD:setupapi.dll", |
| 66 ] | 66 ] |
| 67 } | 67 } |
| 68 | |
| 69 copy("copy_dbghelp.dll") { | |
| 70 sources = [ | |
| 71 "../build/win/dbghelp_xp/dbghelp.dll", | |
| 72 ] | |
| 73 outputs = [ | |
| 74 "$root_out_dir/{{source_file_part}}", | |
| 75 ] | |
| 76 } | |
| 77 } | 68 } |
| 78 | 69 |
| 79 if (is_nacl_nonsfi) { | 70 if (is_nacl_nonsfi) { |
| 80 # Must be in a config because of how GN orders flags (otherwise -Wall will | 71 # Must be in a config because of how GN orders flags (otherwise -Wall will |
| 81 # appear after this, and turn it back on). | 72 # appear after this, and turn it back on). |
| 82 config("nacl_nonsfi_warnings") { | 73 config("nacl_nonsfi_warnings") { |
| 83 # file_util_posix.cc contains a function which is not | 74 # file_util_posix.cc contains a function which is not |
| 84 # being used by nacl_helper_nonsfi. | 75 # being used by nacl_helper_nonsfi. |
| 85 cflags = [ "-Wno-unused-function" ] | 76 cflags = [ "-Wno-unused-function" ] |
| 86 } | 77 } |
| (...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1162 | 1153 |
| 1163 sources -= [ | 1154 sources -= [ |
| 1164 "message_loop/message_pump_libevent.cc", | 1155 "message_loop/message_pump_libevent.cc", |
| 1165 "strings/string16.cc", | 1156 "strings/string16.cc", |
| 1166 | 1157 |
| 1167 # Not using sha1_win.cc because it may have caused a | 1158 # Not using sha1_win.cc because it may have caused a |
| 1168 # regression to page cycler moz. | 1159 # regression to page cycler moz. |
| 1169 "sha1_win.cc", | 1160 "sha1_win.cc", |
| 1170 ] | 1161 ] |
| 1171 | 1162 |
| 1172 # Required for base/stack_trace_win.cc to symbolize correctly. | |
| 1173 data += [ "$root_build_dir/dbghelp.dll" ] | |
| 1174 | |
| 1175 deps += [ "//base/trace_event/etw_manifest:chrome_events_win" ] | 1163 deps += [ "//base/trace_event/etw_manifest:chrome_events_win" ] |
| 1176 if (current_toolchain == default_toolchain) { | |
| 1177 deps += [ ":copy_dbghelp.dll" ] | |
| 1178 } | |
| 1179 | 1164 |
| 1180 if (is_component_build) { | 1165 if (is_component_build) { |
| 1181 # Copy the VS runtime DLLs into the isolate so that they don't have to be | 1166 # Copy the VS runtime DLLs into the isolate so that they don't have to be |
| 1182 # preinstalled on the target machine. The debug runtimes have a "d" at | 1167 # preinstalled on the target machine. The debug runtimes have a "d" at |
| 1183 # the end. | 1168 # the end. |
| 1184 if (is_debug) { | 1169 if (is_debug) { |
| 1185 vcrt_suffix = "d" | 1170 vcrt_suffix = "d" |
| 1186 } else { | 1171 } else { |
| 1187 vcrt_suffix = "" | 1172 vcrt_suffix = "" |
| 1188 } | 1173 } |
| (...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2331 | 2316 |
| 2332 # GYP: //base.gyp:base_java_unittest_support | 2317 # GYP: //base.gyp:base_java_unittest_support |
| 2333 android_library("base_java_unittest_support") { | 2318 android_library("base_java_unittest_support") { |
| 2334 deps = [ | 2319 deps = [ |
| 2335 ":base_java", | 2320 ":base_java", |
| 2336 ] | 2321 ] |
| 2337 java_files = | 2322 java_files = |
| 2338 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 2323 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 2339 } | 2324 } |
| 2340 } | 2325 } |
| OLD | NEW |