Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Side by Side Diff: chrome/test/BUILD.gn

Issue 1121363002: GN Windows component build fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@component2
Patch Set: . Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/installer/util/installer_util_unittests_resource.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 deps += [ 378 deps += [
379 "//chrome:other_version", 379 "//chrome:other_version",
380 "//third_party/isimpledom", 380 "//third_party/isimpledom",
381 "//third_party/wtl", 381 "//third_party/wtl",
382 "//ui/resources", 382 "//ui/resources",
383 ] 383 ]
384 384
385 configs -= [ "//build/config/win:default_incremental_linking" ] 385 configs -= [ "//build/config/win:default_incremental_linking" ]
386 configs += 386 configs +=
387 [ "//build/config/win:default_large_module_incremental_linking" ] 387 [ "//build/config/win:default_large_module_incremental_linking" ]
388
389 libs = [ "oleacc.lib" ]
388 } 390 }
389 391
390 if (is_mac) { 392 if (is_mac) {
391 datadeps += [ "//chrome" ] 393 datadeps += [ "//chrome" ]
392 394
393 # TODO(mark): We really want this for all non-static library targets, but 395 # TODO(mark): We really want this for all non-static library targets, but
394 # when we tried to pull it up to the common.gypi level, it broke other 396 # when we tried to pull it up to the common.gypi level, it broke other
395 # things like the ui and startup tests. *shrug* 397 # things like the ui and startup tests. *shrug*
396 ldflags += [ "-Wl,-ObjC" ] 398 ldflags += [ "-Wl,-ObjC" ]
397 } 399 }
(...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 } 1745 }
1744 1746
1745 if (cld_version == 0 || cld_version == 2) { 1747 if (cld_version == 0 || cld_version == 2) {
1746 # Use whatever CLD2 data access mode that the 1748 # Use whatever CLD2 data access mode that the
1747 # application embedder is using. 1749 # application embedder is using.
1748 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 1750 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
1749 } 1751 }
1750 } 1752 }
1751 } 1753 }
1752 } 1754 }
OLDNEW
« no previous file with comments | « chrome/installer/util/installer_util_unittests_resource.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698