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

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: Fixed bad merge 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') | no next file with comments »
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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 '<(libjpeg_gyp_path):libjpeg', 390 '<(libjpeg_gyp_path):libjpeg',
391 ], 391 ],
392 'direct_dependent_settings': { 392 'direct_dependent_settings': {
393 'defines': [ 393 'defines': [
394 'BLINK_IMPLEMENTATION=1', 394 'BLINK_IMPLEMENTATION=1',
395 'INSIDE_BLINK', 395 'INSIDE_BLINK',
396 ], 396 ],
397 'include_dirs': [ 397 'include_dirs': [
398 '<@(webcore_include_dirs)', 398 '<@(webcore_include_dirs)',
399 '<(DEPTH)/gpu', 399 '<(DEPTH)/gpu',
400 '<(DEPTH)/third_party/angle_dx11/include/GLSLANG', 400 '<(DEPTH)/third_party/angle_dx11/include',
401 ], 401 ],
402 'msvs_disabled_warnings': [ 402 'msvs_disabled_warnings': [
403 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099, 403 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099,
404 ], 404 ],
405 'scons_line_length' : 1, 405 'scons_line_length' : 1,
406 'xcode_settings': { 406 'xcode_settings': {
407 # 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
408 # prefix header injected. 408 # prefix header injected.
409 # FIXME: make this a first-class setting. 409 # FIXME: make this a first-class setting.
410 'GCC_PREFIX_HEADER': 'WebCorePrefixMac.h', 410 'GCC_PREFIX_HEADER': 'WebCorePrefixMac.h',
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h', 1114 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h',
1115 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp', 1115 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp',
1116 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h', 1116 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h',
1117 ], 1117 ],
1118 'sources/': [ 1118 'sources/': [
1119 ['exclude', 'testing/js'], 1119 ['exclude', 'testing/js'],
1120 ], 1120 ],
1121 }, 1121 },
1122 ], # targets 1122 ], # targets
1123 } 1123 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698