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