| 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 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1177 | 1177 |
| 1178 sources -= [ | 1178 sources -= [ |
| 1179 "message_loop/message_pump_libevent.cc", | 1179 "message_loop/message_pump_libevent.cc", |
| 1180 "strings/string16.cc", | 1180 "strings/string16.cc", |
| 1181 | 1181 |
| 1182 # Not using sha1_win.cc because it may have caused a | 1182 # Not using sha1_win.cc because it may have caused a |
| 1183 # regression to page cycler moz. | 1183 # regression to page cycler moz. |
| 1184 "sha1_win.cc", | 1184 "sha1_win.cc", |
| 1185 ] | 1185 ] |
| 1186 | 1186 |
| 1187 deps += [ "//base/trace_event/etw_manifest:chrome_events_win" ] | 1187 deps += [ |
| 1188 "//base/trace_event/etw_manifest:chrome_events_win", |
| 1189 "//base/win:base_win_features", |
| 1190 ] |
| 1188 | 1191 |
| 1189 if (is_component_build) { | 1192 if (is_component_build) { |
| 1190 # Copy the VS runtime DLLs into the isolate so that they don't have to be | 1193 # Copy the VS runtime DLLs into the isolate so that they don't have to be |
| 1191 # preinstalled on the target machine. The debug runtimes have a "d" at | 1194 # preinstalled on the target machine. The debug runtimes have a "d" at |
| 1192 # the end. | 1195 # the end. |
| 1193 if (is_debug) { | 1196 if (is_debug) { |
| 1194 vcrt_suffix = "d" | 1197 vcrt_suffix = "d" |
| 1195 } else { | 1198 } else { |
| 1196 vcrt_suffix = "" | 1199 vcrt_suffix = "" |
| 1197 } | 1200 } |
| (...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1631 "//build/config/sanitizers:deps", | 1634 "//build/config/sanitizers:deps", |
| 1632 ] | 1635 ] |
| 1633 } | 1636 } |
| 1634 | 1637 |
| 1635 loadable_module("scoped_handle_test_dll") { | 1638 loadable_module("scoped_handle_test_dll") { |
| 1636 sources = [ | 1639 sources = [ |
| 1637 "win/scoped_handle_test_dll.cc", | 1640 "win/scoped_handle_test_dll.cc", |
| 1638 ] | 1641 ] |
| 1639 deps = [ | 1642 deps = [ |
| 1640 ":base", | 1643 ":base", |
| 1644 "//base/win:base_win_features", |
| 1641 ] | 1645 ] |
| 1642 } | 1646 } |
| 1643 | 1647 |
| 1644 if (target_cpu == "x64") { | 1648 if (target_cpu == "x64") { |
| 1645 # Must be a shared library so that it can be unloaded during testing. | 1649 # Must be a shared library so that it can be unloaded during testing. |
| 1646 shared_library("base_profiler_test_support_library") { | 1650 shared_library("base_profiler_test_support_library") { |
| 1647 sources = [ | 1651 sources = [ |
| 1648 "profiler/test_support_library.cc", | 1652 "profiler/test_support_library.cc", |
| 1649 ] | 1653 ] |
| 1650 deps = [ | 1654 deps = [ |
| (...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2385 | 2389 |
| 2386 # GYP: //base.gyp:base_java_unittest_support | 2390 # GYP: //base.gyp:base_java_unittest_support |
| 2387 android_library("base_java_unittest_support") { | 2391 android_library("base_java_unittest_support") { |
| 2388 deps = [ | 2392 deps = [ |
| 2389 ":base_java", | 2393 ":base_java", |
| 2390 ] | 2394 ] |
| 2391 java_files = | 2395 java_files = |
| 2392 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 2396 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 2393 } | 2397 } |
| 2394 } | 2398 } |
| OLD | NEW |