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

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

Issue 1062743006: Add installer_util_unittests to the GN windows build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wintests3
Patch Set: Fixes 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/shell_util.cc ('k') | no next file » | 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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 10
(...skipping 1585 matching lines...) Expand 10 before | Expand all | Expand 10 after
1596 sources += rebase_path(unit_gypi_values.chrome_unit_tests_win_sources, 1596 sources += rebase_path(unit_gypi_values.chrome_unit_tests_win_sources,
1597 ".", 1597 ".",
1598 "//chrome") 1598 "//chrome")
1599 sources += [ 1599 sources += [
1600 # TODO: It would be nice to have these pulled in 1600 # TODO: It would be nice to have these pulled in
1601 # automatically from direct_dependent_settings in 1601 # automatically from direct_dependent_settings in
1602 # their various targets (net.gyp:net_resources, etc.), 1602 # their various targets (net.gyp:net_resources, etc.),
1603 # but that causes errors in other targets when 1603 # but that causes errors in other targets when
1604 # resulting .res files get referenced multiple times. 1604 # resulting .res files get referenced multiple times.
1605 #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP ) 1605 #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP )
1606 #'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strin gs.rc', TODO(GYP)
1607 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TO DO(GYP) 1606 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TO DO(GYP)
1608 ] 1607 ]
1609 1608
1610 deps += [ 1609 deps += [
1611 #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unitte st.gyp:verifier_test_dll_1', TODO(GYP) 1610 #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unitte st.gyp:verifier_test_dll_1', TODO(GYP)
1612 #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unitte st.gyp:verifier_test_dll_2', TODO(GYP) 1611 #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unitte st.gyp:verifier_test_dll_2', TODO(GYP)
1613 #'chrome_version_resources', TODO(GYP) 1612 #'chrome_version_resources', TODO(GYP)
1614 "//chrome_elf:blacklist_test_dll_1", 1613 "//chrome_elf:blacklist_test_dll_1",
1614 "//chrome/installer/util:strings",
1615 "//third_party/iaccessible2", 1615 "//third_party/iaccessible2",
1616 "//third_party/isimpledom", 1616 "//third_party/isimpledom",
1617 "//third_party/wtl", 1617 "//third_party/wtl",
1618 ] 1618 ]
1619 1619
1620 configs -= [ "//build/config/win:default_incremental_linking" ] 1620 configs -= [ "//build/config/win:default_incremental_linking" ]
1621 configs += 1621 configs +=
1622 [ "//build/config/win:default_large_module_incremental_linking" ] 1622 [ "//build/config/win:default_large_module_incremental_linking" ]
1623 1623
1624 libs = [ 1624 libs = [
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1753 } 1753 }
1754 1754
1755 if (cld_version == 0 || cld_version == 2) { 1755 if (cld_version == 0 || cld_version == 2) {
1756 # Use whatever CLD2 data access mode that the 1756 # Use whatever CLD2 data access mode that the
1757 # application embedder is using. 1757 # application embedder is using.
1758 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 1758 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
1759 } 1759 }
1760 } 1760 }
1761 } 1761 }
1762 } 1762 }
OLDNEW
« no previous file with comments | « chrome/installer/util/shell_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698