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

Side by Side Diff: content/content_tests.gypi

Issue 2111373002: Reland of Link to DirectWrite directly, instead of calling LoadLibrary (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 5 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 | « content/content_child.gypi ('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 (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 { 5 {
6 'variables': { 6 'variables': {
7 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1144 ['OS=="linux" and use_dbus==1', { 1144 ['OS=="linux" and use_dbus==1', {
1145 'dependencies': [ 1145 'dependencies': [
1146 '../build/linux/system.gyp:dbus', 1146 '../build/linux/system.gyp:dbus',
1147 '../dbus/dbus.gyp:dbus_test_support', 1147 '../dbus/dbus.gyp:dbus_test_support',
1148 ], 1148 ],
1149 }], 1149 }],
1150 ['OS=="win"', { 1150 ['OS=="win"', {
1151 'dependencies': [ 1151 'dependencies': [
1152 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 1152 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
1153 ], 1153 ],
1154 'msvs_settings': {
1155 'VCLinkerTool': {
1156 'AdditionalDependencies': [
1157 'dwrite.lib',
1158 ],
1159 },
1160 },
1154 }], 1161 }],
1155 ['OS=="mac"', { 1162 ['OS=="mac"', {
1156 # These flags are needed to run the test on Mac. 1163 # These flags are needed to run the test on Mac.
1157 # Search for comments about "xcode_settings" in chrome_tests.gypi. 1164 # Search for comments about "xcode_settings" in chrome_tests.gypi.
1158 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 1165 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
1159 }], 1166 }],
1160 ['chromeos==1', { 1167 ['chromeos==1', {
1161 'dependencies': [ 1168 'dependencies': [
1162 '../chromeos/chromeos.gyp:chromeos', 1169 '../chromeos/chromeos.gyp:chromeos',
1163 ], 1170 ],
(...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after
1929 'content_unittests_apk.isolate', 1936 'content_unittests_apk.isolate',
1930 ], 1937 ],
1931 }, 1938 },
1932 ], 1939 ],
1933 }, 1940 },
1934 ], 1941 ],
1935 ], 1942 ],
1936 }], 1943 }],
1937 ], 1944 ],
1938 } 1945 }
OLDNEW
« no previous file with comments | « content/content_child.gypi ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698