| 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 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1172 "message_loop/message_pump_libevent.cc", | 1172 "message_loop/message_pump_libevent.cc", |
| 1173 "strings/string16.cc", | 1173 "strings/string16.cc", |
| 1174 | 1174 |
| 1175 # Not using sha1_win.cc because it may have caused a | 1175 # Not using sha1_win.cc because it may have caused a |
| 1176 # regression to page cycler moz. | 1176 # regression to page cycler moz. |
| 1177 "sha1_win.cc", | 1177 "sha1_win.cc", |
| 1178 ] | 1178 ] |
| 1179 | 1179 |
| 1180 deps += [ "//base/trace_event/etw_manifest:chrome_events_win" ] | 1180 deps += [ "//base/trace_event/etw_manifest:chrome_events_win" ] |
| 1181 | 1181 |
| 1182 public_deps += [ "//base/win:base_win_features" ] |
| 1183 |
| 1182 if (is_component_build) { | 1184 if (is_component_build) { |
| 1183 # Copy the VS runtime DLLs into the isolate so that they don't have to be | 1185 # Copy the VS runtime DLLs into the isolate so that they don't have to be |
| 1184 # preinstalled on the target machine. The debug runtimes have a "d" at | 1186 # preinstalled on the target machine. The debug runtimes have a "d" at |
| 1185 # the end. | 1187 # the end. |
| 1186 if (is_debug) { | 1188 if (is_debug) { |
| 1187 vcrt_suffix = "d" | 1189 vcrt_suffix = "d" |
| 1188 } else { | 1190 } else { |
| 1189 vcrt_suffix = "" | 1191 vcrt_suffix = "" |
| 1190 } | 1192 } |
| 1191 | 1193 |
| (...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2376 | 2378 |
| 2377 # GYP: //base.gyp:base_java_unittest_support | 2379 # GYP: //base.gyp:base_java_unittest_support |
| 2378 android_library("base_java_unittest_support") { | 2380 android_library("base_java_unittest_support") { |
| 2379 deps = [ | 2381 deps = [ |
| 2380 ":base_java", | 2382 ":base_java", |
| 2381 ] | 2383 ] |
| 2382 java_files = | 2384 java_files = |
| 2383 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 2385 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 2384 } | 2386 } |
| 2385 } | 2387 } |
| OLD | NEW |