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

Side by Side Diff: Source/platform/blink_platform.gyp

Issue 219963019: Revert r170536 - "Rename DatabaseTaskSynchronizer to TaskSynchronizer ..." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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/platform/TaskSynchronizer.cpp ('k') | Source/platform/blink_platform.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) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 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 22 matching lines...) Expand all
33 '../build/scripts/scripts.gypi', 33 '../build/scripts/scripts.gypi',
34 '../build/win/precompile.gypi', 34 '../build/win/precompile.gypi',
35 'blink_platform.gypi', 35 'blink_platform.gypi',
36 ], 36 ],
37 'targets': [{ 37 'targets': [{
38 'target_name': 'blink_common', 38 'target_name': 'blink_common',
39 'type': '<(component)', 39 'type': '<(component)',
40 'variables': { 'enable_wexit_time_destructors': 1 }, 40 'variables': { 'enable_wexit_time_destructors': 1 },
41 'dependencies': [ 41 'dependencies': [
42 '../config.gyp:config', 42 '../config.gyp:config',
43 '../heap/blink_heap.gyp:blink_heap',
44 '../wtf/wtf.gyp:wtf', 43 '../wtf/wtf.gyp:wtf',
45 # FIXME: Can we remove the dependency on Skia? 44 # FIXME: Can we remove the dependency on Skia?
46 '<(DEPTH)/skia/skia.gyp:skia', 45 '<(DEPTH)/skia/skia.gyp:skia',
47 ], 46 ],
48 'all_dependent_settings': { 47 'all_dependent_settings': {
49 'include_dirs': [ 48 'include_dirs': [
50 '..', 49 '..',
51 ], 50 ],
52 }, 51 },
53 'export_dependent_settings': [ 52 'export_dependent_settings': [
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 ], 118 ],
120 }, 119 },
121 }], 120 }],
122 ], 121 ],
123 }, 122 },
124 { 123 {
125 'target_name': 'blink_platform', 124 'target_name': 'blink_platform',
126 'type': '<(component)', 125 'type': '<(component)',
127 'dependencies': [ 126 'dependencies': [
128 '../config.gyp:config', 127 '../config.gyp:config',
129 '../heap/blink_heap.gyp:blink_heap',
130 '../wtf/wtf.gyp:wtf', 128 '../wtf/wtf.gyp:wtf',
131 'blink_common', 129 'blink_common',
132 'blink_prerequisites', 130 'blink_prerequisites',
133 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 131 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
134 '<(DEPTH)/skia/skia.gyp:skia', 132 '<(DEPTH)/skia/skia.gyp:skia',
135 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 133 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
136 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 134 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
137 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 135 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
138 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 136 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
139 '<(DEPTH)/third_party/ots/ots.gyp:ots', 137 '<(DEPTH)/third_party/ots/ots.gyp:ots',
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 ['OS=="android"', { 418 ['OS=="android"', {
421 'cflags!': ['-mthumb'], 419 'cflags!': ['-mthumb'],
422 }], 420 }],
423 ], 421 ],
424 },{ # target_arch!="arm" 422 },{ # target_arch!="arm"
425 'type': 'none', 423 'type': 'none',
426 }], 424 }],
427 ], 425 ],
428 }], 426 }],
429 } 427 }
OLDNEW
« no previous file with comments | « Source/platform/TaskSynchronizer.cpp ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698