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

Side by Side Diff: Source/core/core.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) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', 223 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
224 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 224 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
225 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 225 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
226 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 226 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
227 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 227 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
228 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 228 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
229 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 229 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
230 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 230 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
231 '<(DEPTH)/url/url.gyp:url_lib', 231 '<(DEPTH)/url/url.gyp:url_lib',
232 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 232 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
233 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
Inactive 2014/05/22 13:52:02 Alphabetical order please
233 ], 234 ],
234 'include_dirs': [ 235 'include_dirs': [
235 '<(SHARED_INTERMEDIATE_DIR)/blink', 236 '<(SHARED_INTERMEDIATE_DIR)/blink',
236 '<(bindings_output_dir)', 237 '<(bindings_output_dir)',
237 '<@(webcore_include_dirs)', 238 '<@(webcore_include_dirs)',
238 239
239 # FIXME: Remove these once the bindings script generates qualified 240 # FIXME: Remove these once the bindings script generates qualified
240 # includes for these correctly. (Sequences don't work yet.) 241 # includes for these correctly. (Sequences don't work yet.)
241 '<(bindings_v8_dir)/custom', 242 '<(bindings_v8_dir)/custom',
242 'html', 243 'html',
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 375 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
375 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 376 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
376 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 377 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
377 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 378 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
378 '<(DEPTH)/third_party/ots/ots.gyp:ots', 379 '<(DEPTH)/third_party/ots/ots.gyp:ots',
379 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 380 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
380 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 381 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
381 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 382 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
382 '<(DEPTH)/url/url.gyp:url_lib', 383 '<(DEPTH)/url/url.gyp:url_lib',
383 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 384 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
385 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
Inactive 2014/05/22 13:52:02 ditto
384 ], 386 ],
385 'export_dependent_settings': [ 387 'export_dependent_settings': [
386 '../wtf/wtf.gyp:wtf', 388 '../wtf/wtf.gyp:wtf',
387 '../config.gyp:config', 389 '../config.gyp:config',
388 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 390 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
389 '<(DEPTH)/skia/skia.gyp:skia', 391 '<(DEPTH)/skia/skia.gyp:skia',
390 '<(angle_path)/src/build_angle.gyp:translator', 392 '<(angle_path)/src/build_angle.gyp:translator',
391 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', 393 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
392 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 394 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
393 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 395 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
394 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 396 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
395 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 397 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
396 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 398 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
397 '<(DEPTH)/third_party/ots/ots.gyp:ots', 399 '<(DEPTH)/third_party/ots/ots.gyp:ots',
398 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 400 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
399 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 401 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
400 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 402 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
401 '<(DEPTH)/url/url.gyp:url_lib', 403 '<(DEPTH)/url/url.gyp:url_lib',
402 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 404 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
405 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
Inactive 2014/05/22 13:52:02 ditto
403 ], 406 ],
404 'direct_dependent_settings': { 407 'direct_dependent_settings': {
405 'defines': [ 408 'defines': [
406 'BLINK_IMPLEMENTATION=1', 409 'BLINK_IMPLEMENTATION=1',
407 'INSIDE_BLINK', 410 'INSIDE_BLINK',
408 ], 411 ],
409 'include_dirs': [ 412 'include_dirs': [
410 '<@(webcore_include_dirs)', 413 '<@(webcore_include_dirs)',
411 '<(DEPTH)/gpu', 414 '<(DEPTH)/gpu',
412 '<(angle_path)/include', 415 '<(angle_path)/include',
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 'webcore_rendering', 740 'webcore_rendering',
738 'webcore_svg', 741 'webcore_svg',
739 # Exported. 742 # Exported.
740 'webcore_generated', 743 'webcore_generated',
741 '../wtf/wtf.gyp:wtf', 744 '../wtf/wtf.gyp:wtf',
742 '<(DEPTH)/skia/skia.gyp:skia', 745 '<(DEPTH)/skia/skia.gyp:skia',
743 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 746 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
744 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 747 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
745 '<(DEPTH)/url/url.gyp:url_lib', 748 '<(DEPTH)/url/url.gyp:url_lib',
746 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 749 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
750 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
Inactive 2014/05/22 13:52:02 ditto
747 ], 751 ],
748 'export_dependent_settings': [ 752 'export_dependent_settings': [
749 '../wtf/wtf.gyp:wtf', 753 '../wtf/wtf.gyp:wtf',
750 'webcore_generated', 754 'webcore_generated',
751 '<(DEPTH)/skia/skia.gyp:skia', 755 '<(DEPTH)/skia/skia.gyp:skia',
752 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 756 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
753 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 757 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
754 '<(DEPTH)/url/url.gyp:url_lib', 758 '<(DEPTH)/url/url.gyp:url_lib',
755 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 759 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
756 ], 760 ],
(...skipping 23 matching lines...) Expand all
780 }, 784 },
781 }], 785 }],
782 ], 786 ],
783 }, 787 },
784 { 788 {
785 'target_name': 'webcore_testing', 789 'target_name': 'webcore_testing',
786 'type': 'static_library', 790 'type': 'static_library',
787 'dependencies': [ 791 'dependencies': [
788 '../config.gyp:config', 792 '../config.gyp:config',
789 'webcore', 793 'webcore',
794 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
790 ], 795 ],
791 'defines': [ 796 'defines': [
792 'BLINK_IMPLEMENTATION=1', 797 'BLINK_IMPLEMENTATION=1',
793 'INSIDE_BLINK', 798 'INSIDE_BLINK',
794 ], 799 ],
795 'include_dirs': [ 800 'include_dirs': [
796 '<(bindings_v8_dir)', # FIXME: Remove once http://crbug.com/236119 is f ixed. 801 '<(bindings_v8_dir)', # FIXME: Remove once http://crbug.com/236119 is f ixed.
797 'testing', 802 'testing',
798 'testing/v8', 803 'testing/v8',
799 ], 804 ],
(...skipping 19 matching lines...) Expand all
819 '<(bindings_output_dir)/V8LayerRect.h', 824 '<(bindings_output_dir)/V8LayerRect.h',
820 '<(bindings_output_dir)/V8LayerRectList.cpp', 825 '<(bindings_output_dir)/V8LayerRectList.cpp',
821 '<(bindings_output_dir)/V8LayerRectList.h', 826 '<(bindings_output_dir)/V8LayerRectList.h',
822 ], 827 ],
823 'sources/': [ 828 'sources/': [
824 ['exclude', 'testing/js'], 829 ['exclude', 'testing/js'],
825 ], 830 ],
826 }, 831 },
827 ], # targets 832 ], # targets
828 } 833 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698