| 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 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1234 "$root_out_dir/api-ms-win-crt-utility-l1-1-0.dll", | 1234 "$root_out_dir/api-ms-win-crt-utility-l1-1-0.dll", |
| 1235 "$root_out_dir/ucrtbase${vcrt_suffix}.dll", | 1235 "$root_out_dir/ucrtbase${vcrt_suffix}.dll", |
| 1236 ] | 1236 ] |
| 1237 } else { | 1237 } else { |
| 1238 data += [ | 1238 data += [ |
| 1239 "$root_out_dir/msvcp120${vcrt_suffix}.dll", | 1239 "$root_out_dir/msvcp120${vcrt_suffix}.dll", |
| 1240 "$root_out_dir/msvcr120${vcrt_suffix}.dll", | 1240 "$root_out_dir/msvcr120${vcrt_suffix}.dll", |
| 1241 ] | 1241 ] |
| 1242 } | 1242 } |
| 1243 if (is_asan) { | 1243 if (is_asan) { |
| 1244 data += [ "//third_party/llvm-build/Release+Asserts/lib/clang/3.9.0/lib/
windows/clang_rt.asan_dynamic-i386.dll" ] | 1244 data += [ "//third_party/llvm-build/Release+Asserts/lib/clang/$clang_ver
sion/lib/windows/clang_rt.asan_dynamic-i386.dll" ] |
| 1245 } | 1245 } |
| 1246 } | 1246 } |
| 1247 | 1247 |
| 1248 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 1248 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 1249 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 1249 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
| 1250 | 1250 |
| 1251 libs = [ | 1251 libs = [ |
| 1252 "cfgmgr32.lib", | 1252 "cfgmgr32.lib", |
| 1253 "netapi32.lib", | 1253 "netapi32.lib", |
| 1254 "powrprof.lib", | 1254 "powrprof.lib", |
| (...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2361 | 2361 |
| 2362 # GYP: //base.gyp:base_java_unittest_support | 2362 # GYP: //base.gyp:base_java_unittest_support |
| 2363 android_library("base_java_unittest_support") { | 2363 android_library("base_java_unittest_support") { |
| 2364 deps = [ | 2364 deps = [ |
| 2365 ":base_java", | 2365 ":base_java", |
| 2366 ] | 2366 ] |
| 2367 java_files = | 2367 java_files = |
| 2368 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 2368 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 2369 } | 2369 } |
| 2370 } | 2370 } |
| OLD | NEW |