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

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

Issue 25825003: Move ANGLEWebKitBridge to platform/graphics/angle/ANGLEPlatformBridge. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/core.gypi » ('j') | Source/platform/blink_platform.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 'injected_script_source', 347 'injected_script_source',
348 'inspector_overlay_page', 348 'inspector_overlay_page',
349 'inspector_protocol_sources', 349 'inspector_protocol_sources',
350 'inspector_instrumentation_sources', 350 'inspector_instrumentation_sources',
351 '../bindings/derived_sources.gyp:bindings_derived_sources', 351 '../bindings/derived_sources.gyp:bindings_derived_sources',
352 'core_derived_sources.gyp:make_derived_sources', 352 'core_derived_sources.gyp:make_derived_sources',
353 '../wtf/wtf.gyp:wtf', 353 '../wtf/wtf.gyp:wtf',
354 '../config.gyp:config', 354 '../config.gyp:config',
355 '../platform/blink_platform.gyp:blink_platform', 355 '../platform/blink_platform.gyp:blink_platform',
356 '../weborigin/weborigin.gyp:weborigin', 356 '../weborigin/weborigin.gyp:weborigin',
357 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
358 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 357 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
359 '<(DEPTH)/skia/skia.gyp:skia', 358 '<(DEPTH)/skia/skia.gyp:skia',
360 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', 359 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
361 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 360 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
362 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 361 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
363 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 362 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
364 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 363 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
365 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 364 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
366 '<(DEPTH)/third_party/ots/ots.gyp:ots', 365 '<(DEPTH)/third_party/ots/ots.gyp:ots',
367 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 366 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
368 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 367 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
369 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 368 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
370 '<(DEPTH)/url/url.gyp:url_lib', 369 '<(DEPTH)/url/url.gyp:url_lib',
371 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 370 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
372 '<(libjpeg_gyp_path):libjpeg', 371 '<(libjpeg_gyp_path):libjpeg',
373 ], 372 ],
374 'export_dependent_settings': [ 373 'export_dependent_settings': [
375 '../wtf/wtf.gyp:wtf', 374 '../wtf/wtf.gyp:wtf',
376 '../config.gyp:config', 375 '../config.gyp:config',
377 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
378 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 376 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
379 '<(DEPTH)/skia/skia.gyp:skia', 377 '<(DEPTH)/skia/skia.gyp:skia',
380 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', 378 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
381 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 379 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
382 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 380 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
383 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 381 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
384 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 382 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
385 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 383 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
386 '<(DEPTH)/third_party/ots/ots.gyp:ots', 384 '<(DEPTH)/third_party/ots/ots.gyp:ots',
387 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 385 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
388 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 386 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
389 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 387 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
390 '<(DEPTH)/url/url.gyp:url_lib', 388 '<(DEPTH)/url/url.gyp:url_lib',
391 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 389 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
392 '<(libjpeg_gyp_path):libjpeg', 390 '<(libjpeg_gyp_path):libjpeg',
393 ], 391 ],
394 'direct_dependent_settings': { 392 'direct_dependent_settings': {
395 'defines': [ 393 'defines': [
396 'BLINK_IMPLEMENTATION=1', 394 'BLINK_IMPLEMENTATION=1',
397 'INSIDE_BLINK', 395 'INSIDE_BLINK',
398 ], 396 ],
399 'include_dirs': [ 397 'include_dirs': [
400 '<@(webcore_include_dirs)', 398 '<@(webcore_include_dirs)',
401 '<(DEPTH)/gpu', 399 '<(DEPTH)/gpu',
402 '<(DEPTH)/third_party/angle_dx11/include/GLSLANG', 400 '<(DEPTH)/third_party/angle_dx11/include',
403 ], 401 ],
404 'msvs_disabled_warnings': [ 402 'msvs_disabled_warnings': [
405 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099, 403 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099,
406 ], 404 ],
407 'scons_line_length' : 1, 405 'scons_line_length' : 1,
408 'xcode_settings': { 406 'xcode_settings': {
409 # Some Mac-specific parts of WebKit won't compile without having this 407 # Some Mac-specific parts of WebKit won't compile without having this
410 # prefix header injected. 408 # prefix header injected.
411 # FIXME: make this a first-class setting. 409 # FIXME: make this a first-class setting.
412 'GCC_PREFIX_HEADER': 'WebCorePrefixMac.h', 410 'GCC_PREFIX_HEADER': 'WebCorePrefixMac.h',
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h', 1094 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h',
1097 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp', 1095 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp',
1098 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h', 1096 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h',
1099 ], 1097 ],
1100 'sources/': [ 1098 'sources/': [
1101 ['exclude', 'testing/js'], 1099 ['exclude', 'testing/js'],
1102 ], 1100 ],
1103 }, 1101 },
1104 ], # targets 1102 ], # targets
1105 } 1103 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/core.gypi » ('j') | Source/platform/blink_platform.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698