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

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

Issue 25730004: Git rid of translator_glsl dependency. (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 | « Source/core/core.gyp ('k') | no next file » | 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) 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 30 matching lines...) Expand all
41 'targets': [ 41 'targets': [
42 { 42 {
43 'target_name': 'webkit', 43 'target_name': 'webkit',
44 'type': '<(component)', 44 'type': '<(component)',
45 'variables': { 'enable_wexit_time_destructors': 1, }, 45 'variables': { 'enable_wexit_time_destructors': 1, },
46 'dependencies': [ 46 'dependencies': [
47 '../platform/blink_platform.gyp:blink_common', 47 '../platform/blink_platform.gyp:blink_common',
48 '../core/core.gyp:webcore', 48 '../core/core.gyp:webcore',
49 '../modules/modules.gyp:modules', 49 '../modules/modules.gyp:modules',
50 '<(DEPTH)/skia/skia.gyp:skia', 50 '<(DEPTH)/skia/skia.gyp:skia',
51 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_ glsl', 51 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator' ,
52 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 52 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
53 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 53 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
54 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 54 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
55 ], 55 ],
56 'export_dependent_settings': [ 56 'export_dependent_settings': [
57 '<(DEPTH)/skia/skia.gyp:skia', 57 '<(DEPTH)/skia/skia.gyp:skia',
58 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 58 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
59 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 59 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
60 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 60 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
61 ], 61 ],
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 ['clang==1', { 288 ['clang==1', {
289 'target_defaults': { 289 'target_defaults': {
290 'cflags': ['-Wglobal-constructors'], 290 'cflags': ['-Wglobal-constructors'],
291 'xcode_settings': { 291 'xcode_settings': {
292 'WARNING_CFLAGS': ['-Wglobal-constructors'], 292 'WARNING_CFLAGS': ['-Wglobal-constructors'],
293 }, 293 },
294 }, 294 },
295 }], 295 }],
296 ], # conditions 296 ], # conditions
297 } 297 }
OLDNEW
« no previous file with comments | « Source/core/core.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698