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

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

Issue 1807853003: Deprecate some macros in wtf/Assertions.h in favor of base/logging.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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) 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 'sources': [ 83 'sources': [
84 '<@(web_files)', 84 '<@(web_files)',
85 ], 85 ],
86 'conditions': [ 86 'conditions': [
87 ['component=="shared_library"', { 87 ['component=="shared_library"', {
88 'dependencies': [ 88 'dependencies': [
89 '../core/core.gyp:webcore_shared', 89 '../core/core.gyp:webcore_shared',
90 '../platform/blink_platform.gyp:blink_common', 90 '../platform/blink_platform.gyp:blink_common',
91 '../platform/blink_platform.gyp:blink_platform', 91 '../platform/blink_platform.gyp:blink_platform',
92 '../wtf/wtf.gyp:wtf', 92 '../wtf/wtf.gyp:wtf',
93 '../wtf/wtf_tests.gyp:wtf_unittest_helpers',
94 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 93 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
95 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 94 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
96 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 95 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
97 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 96 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
98 '<(DEPTH)/third_party/ots/ots.gyp:ots', 97 '<(DEPTH)/third_party/ots/ots.gyp:ots',
99 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 98 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
100 '<(DEPTH)/url/url.gyp:url_lib', 99 '<(DEPTH)/url/url.gyp:url_lib',
101 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 100 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
102 '<(libjpeg_gyp_path):libjpeg', 101 '<(libjpeg_gyp_path):libjpeg',
103 # We must not add webkit_support here because of cyclic dependency. 102 # We must not add webkit_support here because of cyclic dependency.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa' ], 229 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa' ],
231 'copies': [{ 230 'copies': [{
232 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Conten ts/MacOS/', 231 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Conten ts/MacOS/',
233 'files': ['<(PRODUCT_DIR)/osmesa.so'], 232 'files': ['<(PRODUCT_DIR)/osmesa.so'],
234 }], 233 }],
235 }, 234 },
236 ], 235 ],
237 }], 236 }],
238 ], # conditions 237 ], # conditions
239 } 238 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698