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

Side by Side Diff: Source/web/web.gyp

Issue 276573010: Adding Locale (language attribute) information to font and using the (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Comment fix Created 6 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
OLDNEW
1 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 'dependencies': [ 48 'dependencies': [
49 '../config.gyp:config', 49 '../config.gyp:config',
50 '../platform/blink_platform.gyp:blink_common', 50 '../platform/blink_platform.gyp:blink_common',
51 '../core/core.gyp:webcore', 51 '../core/core.gyp:webcore',
52 '../modules/modules.gyp:modules', 52 '../modules/modules.gyp:modules',
53 '<(DEPTH)/skia/skia.gyp:skia', 53 '<(DEPTH)/skia/skia.gyp:skia',
54 '<(angle_path)/src/build_angle.gyp:translator', 54 '<(angle_path)/src/build_angle.gyp:translator',
55 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 55 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
56 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 56 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
57 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 57 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
58 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
Inactive 2014/05/22 13:52:02 alphabetical order.
58 ], 59 ],
59 'export_dependent_settings': [ 60 'export_dependent_settings': [
60 '<(DEPTH)/skia/skia.gyp:skia', 61 '<(DEPTH)/skia/skia.gyp:skia',
61 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 62 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
62 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 63 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
63 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 64 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
65 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
Inactive 2014/05/22 13:52:02 ditto
64 ], 66 ],
65 'include_dirs': [ 67 'include_dirs': [
66 '<(angle_path)/include', 68 '<(angle_path)/include',
67 '<(DEPTH)/third_party/skia/include/utils', 69 '<(DEPTH)/third_party/skia/include/utils',
68 ], 70 ],
69 'defines': [ 71 'defines': [
70 'BLINK_IMPLEMENTATION=1', 72 'BLINK_IMPLEMENTATION=1',
71 'INSIDE_BLINK', 73 'INSIDE_BLINK',
72 ], 74 ],
73 'sources': [ 75 'sources': [
(...skipping 14 matching lines...) Expand all
88 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 90 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
89 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 91 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
90 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 92 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
91 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 93 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
92 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64', 94 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
93 '<(DEPTH)/third_party/ots/ots.gyp:ots', 95 '<(DEPTH)/third_party/ots/ots.gyp:ots',
94 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 96 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
95 '<(DEPTH)/url/url.gyp:url_lib', 97 '<(DEPTH)/url/url.gyp:url_lib',
96 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 98 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
97 '<(libjpeg_gyp_path):libjpeg', 99 '<(libjpeg_gyp_path):libjpeg',
100 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz- ng',
Inactive 2014/05/22 13:52:02 ditto
98 # We must not add webkit_support here because of cyclic dependency. 101 # We must not add webkit_support here because of cyclic dependency.
99 ], 102 ],
100 'export_dependent_settings': [ 103 'export_dependent_settings': [
101 '<(DEPTH)/url/url.gyp:url_lib', 104 '<(DEPTH)/url/url.gyp:url_lib',
102 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 105 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
103 ], 106 ],
104 'sources': [ 107 'sources': [
105 # Compile Blink unittest files into blink_web.dll in com ponent build mode 108 # Compile Blink unittest files into blink_web.dll in com ponent build mode
106 # since there're methods that are tested but not exporte d. 109 # since there're methods that are tested but not exporte d.
107 # WebUnitTests.* exports an API that runs all the unitte sts inside 110 # WebUnitTests.* exports an API that runs all the unitte sts inside
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 ['component=="shared_library"', { 291 ['component=="shared_library"', {
289 'type': 'none', 292 'type': 'none',
290 }, { 293 }, {
291 'type': 'static_library', 294 'type': 'static_library',
292 'dependencies': [ 295 'dependencies': [
293 '../config.gyp:config', 296 '../config.gyp:config',
294 '../core/core.gyp:webcore_testing', 297 '../core/core.gyp:webcore_testing',
295 '../modules/modules.gyp:modules_testing', 298 '../modules/modules.gyp:modules_testing',
296 '../wtf/wtf.gyp:wtf', 299 '../wtf/wtf.gyp:wtf',
297 '<(DEPTH)/skia/skia.gyp:skia', 300 '<(DEPTH)/skia/skia.gyp:skia',
301 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz- ng',
298 ], 302 ],
299 'include_dirs': [ 303 'include_dirs': [
300 '../../', 304 '../../',
301 ], 305 ],
302 'sources': [ 306 'sources': [
303 'WebTestingSupport.cpp', 307 'WebTestingSupport.cpp',
304 ], 308 ],
305 }], 309 }],
306 ], 310 ],
307 }, 311 },
(...skipping 22 matching lines...) Expand all
330 ['clang==1', { 334 ['clang==1', {
331 'target_defaults': { 335 'target_defaults': {
332 'cflags': ['-Wglobal-constructors'], 336 'cflags': ['-Wglobal-constructors'],
333 'xcode_settings': { 337 'xcode_settings': {
334 'WARNING_CFLAGS': ['-Wglobal-constructors'], 338 'WARNING_CFLAGS': ['-Wglobal-constructors'],
335 }, 339 },
336 }, 340 },
337 }], 341 }],
338 ], # conditions 342 ], # conditions
339 } 343 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698