| 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/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 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1597 # automatically from direct_dependent_settings in | 1597 # automatically from direct_dependent_settings in |
| 1598 # their various targets (net.gyp:net_resources, etc.), | 1598 # their various targets (net.gyp:net_resources, etc.), |
| 1599 # but that causes errors in other targets when | 1599 # but that causes errors in other targets when |
| 1600 # resulting .res files get referenced multiple times. | 1600 # resulting .res files get referenced multiple times. |
| 1601 #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP
) | 1601 #'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', TODO(GYP
) |
| 1602 #'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strin
gs.rc', TODO(GYP) | 1602 #'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strin
gs.rc', TODO(GYP) |
| 1603 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TO
DO(GYP) | 1603 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TO
DO(GYP) |
| 1604 ] | 1604 ] |
| 1605 | 1605 |
| 1606 deps += [ | 1606 deps += [ |
| 1607 #'browser/safe_browsing/verifier_test/verifier_unittest.gyp:verifier_tes
t_dll_1', TODO(GYP) | 1607 #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unitte
st.gyp:verifier_test_dll_1', TODO(GYP) |
| 1608 #'browser/safe_browsing/verifier_test/verifier_unittest.gyp:verifier_tes
t_dll_2', TODO(GYP) | 1608 #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unitte
st.gyp:verifier_test_dll_2', TODO(GYP) |
| 1609 #'chrome_version_resources', TODO(GYP) | 1609 #'chrome_version_resources', TODO(GYP) |
| 1610 "//chrome_elf:blacklist_test_dll_1", | 1610 "//chrome_elf:blacklist_test_dll_1", |
| 1611 "//third_party/iaccessible2", | 1611 "//third_party/iaccessible2", |
| 1612 "//third_party/isimpledom", | 1612 "//third_party/isimpledom", |
| 1613 "//third_party/wtl", | 1613 "//third_party/wtl", |
| 1614 ] | 1614 ] |
| 1615 | 1615 |
| 1616 libs = [ | 1616 libs = [ |
| 1617 "comsupp.lib", | 1617 "comsupp.lib", |
| 1618 "oleacc.lib", | 1618 "oleacc.lib", |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1740 } | 1740 } |
| 1741 | 1741 |
| 1742 if (cld_version == 0 || cld_version == 2) { | 1742 if (cld_version == 0 || cld_version == 2) { |
| 1743 # Use whatever CLD2 data access mode that the | 1743 # Use whatever CLD2 data access mode that the |
| 1744 # application embedder is using. | 1744 # application embedder is using. |
| 1745 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 1745 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
| 1746 } | 1746 } |
| 1747 } | 1747 } |
| 1748 } | 1748 } |
| 1749 } | 1749 } |
| OLD | NEW |