| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//build/module_args/v8.gni") | 9 import("//build/module_args/v8.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 deps += [ | 377 deps += [ |
| 378 "//chrome:other_version", | 378 "//chrome:other_version", |
| 379 "//third_party/isimpledom", | 379 "//third_party/isimpledom", |
| 380 "//third_party/wtl", | 380 "//third_party/wtl", |
| 381 "//ui/resources", | 381 "//ui/resources", |
| 382 ] | 382 ] |
| 383 | 383 |
| 384 configs -= [ "//build/config/win:default_incremental_linking" ] | 384 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 385 configs += | 385 configs += |
| 386 [ "//build/config/win:default_large_module_incremental_linking" ] | 386 [ "//build/config/win:default_large_module_incremental_linking" ] |
| 387 |
| 388 libs = [ "oleacc.lib" ] |
| 387 } | 389 } |
| 388 | 390 |
| 389 if (is_mac) { | 391 if (is_mac) { |
| 390 datadeps += [ "//chrome" ] | 392 datadeps += [ "//chrome" ] |
| 391 | 393 |
| 392 # TODO(mark): We really want this for all non-static library targets, but | 394 # TODO(mark): We really want this for all non-static library targets, but |
| 393 # when we tried to pull it up to the common.gypi level, it broke other | 395 # when we tried to pull it up to the common.gypi level, it broke other |
| 394 # things like the ui and startup tests. *shrug* | 396 # things like the ui and startup tests. *shrug* |
| 395 ldflags += [ "-Wl,-ObjC" ] | 397 ldflags += [ "-Wl,-ObjC" ] |
| 396 } | 398 } |
| (...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1742 } | 1744 } |
| 1743 | 1745 |
| 1744 if (cld_version == 0 || cld_version == 2) { | 1746 if (cld_version == 0 || cld_version == 2) { |
| 1745 # Use whatever CLD2 data access mode that the | 1747 # Use whatever CLD2 data access mode that the |
| 1746 # application embedder is using. | 1748 # application embedder is using. |
| 1747 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 1749 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
| 1748 } | 1750 } |
| 1749 } | 1751 } |
| 1750 } | 1752 } |
| 1751 } | 1753 } |
| OLD | NEW |