| 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 1248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1259 if (is_asan) { | 1259 if (is_asan) { |
| 1260 data += [ "//third_party/llvm-build/Release+Asserts/lib/clang/$clang_ver
sion/lib/windows/clang_rt.asan_dynamic-i386.dll" ] | 1260 data += [ "//third_party/llvm-build/Release+Asserts/lib/clang/$clang_ver
sion/lib/windows/clang_rt.asan_dynamic-i386.dll" ] |
| 1261 } | 1261 } |
| 1262 } | 1262 } |
| 1263 | 1263 |
| 1264 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 1264 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 1265 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 1265 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
| 1266 | 1266 |
| 1267 libs = [ | 1267 libs = [ |
| 1268 "cfgmgr32.lib", | 1268 "cfgmgr32.lib", |
| 1269 "netapi32.lib", | |
| 1270 "powrprof.lib", | 1269 "powrprof.lib", |
| 1271 "setupapi.lib", | 1270 "setupapi.lib", |
| 1272 "userenv.lib", | 1271 "userenv.lib", |
| 1273 "winmm.lib", | 1272 "winmm.lib", |
| 1274 ] | 1273 ] |
| 1275 all_dependent_configs = [ ":base_win_linker_flags" ] | 1274 all_dependent_configs = [ ":base_win_linker_flags" ] |
| 1276 } else if (!is_nacl || is_nacl_nonsfi) { | 1275 } else if (!is_nacl || is_nacl_nonsfi) { |
| 1277 # Non-Windows. | 1276 # Non-Windows. |
| 1278 deps += [ "//base/third_party/libevent" ] | 1277 deps += [ "//base/third_party/libevent" ] |
| 1279 } | 1278 } |
| (...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2389 | 2388 |
| 2390 # GYP: //base.gyp:base_java_unittest_support | 2389 # GYP: //base.gyp:base_java_unittest_support |
| 2391 android_library("base_java_unittest_support") { | 2390 android_library("base_java_unittest_support") { |
| 2392 deps = [ | 2391 deps = [ |
| 2393 ":base_java", | 2392 ":base_java", |
| 2394 ] | 2393 ] |
| 2395 java_files = | 2394 java_files = |
| 2396 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 2395 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 2397 } | 2396 } |
| 2398 } | 2397 } |
| OLD | NEW |