| 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 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 "strings/string16.cc", | 1113 "strings/string16.cc", |
| 1114 | 1114 |
| 1115 # Not using sha1_win.cc because it may have caused a | 1115 # Not using sha1_win.cc because it may have caused a |
| 1116 # regression to page cycler moz. | 1116 # regression to page cycler moz. |
| 1117 "sha1_win.cc", | 1117 "sha1_win.cc", |
| 1118 ] | 1118 ] |
| 1119 | 1119 |
| 1120 # Required for base/stack_trace_win.cc to symbolize correctly. | 1120 # Required for base/stack_trace_win.cc to symbolize correctly. |
| 1121 data += [ "$root_build_dir/dbghelp.dll" ] | 1121 data += [ "$root_build_dir/dbghelp.dll" ] |
| 1122 | 1122 |
| 1123 deps += [ | 1123 deps += [ "//base/trace_event/etw_manifest:chrome_events_win" ] |
| 1124 ":copy_dbghelp.dll", | 1124 if (current_toolchain == default_toolchain) { |
| 1125 "//base/trace_event/etw_manifest:chrome_events_win", | 1125 deps += [ ":copy_dbghelp.dll" ] |
| 1126 ] | 1126 } |
| 1127 | 1127 |
| 1128 if (is_component_build) { | 1128 if (is_component_build) { |
| 1129 # Copy the VS runtime DLLs into the isolate so that they don't have to be | 1129 # Copy the VS runtime DLLs into the isolate so that they don't have to be |
| 1130 # preinstalled on the target machine. The debug runtimes have a "d" at | 1130 # preinstalled on the target machine. The debug runtimes have a "d" at |
| 1131 # the end. | 1131 # the end. |
| 1132 if (is_debug) { | 1132 if (is_debug) { |
| 1133 vcrt_suffix = "d" | 1133 vcrt_suffix = "d" |
| 1134 } else { | 1134 } else { |
| 1135 vcrt_suffix = "" | 1135 vcrt_suffix = "" |
| 1136 } | 1136 } |
| (...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2050 | 2050 |
| 2051 # GYP: //base.gyp:base_java_unittest_support | 2051 # GYP: //base.gyp:base_java_unittest_support |
| 2052 android_library("base_java_unittest_support") { | 2052 android_library("base_java_unittest_support") { |
| 2053 deps = [ | 2053 deps = [ |
| 2054 ":base_java", | 2054 ":base_java", |
| 2055 ] | 2055 ] |
| 2056 java_files = | 2056 java_files = |
| 2057 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 2057 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 2058 } | 2058 } |
| 2059 } | 2059 } |
| OLD | NEW |