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

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

Issue 2043753002: Declarative resource hints go through mojo IPC to //content Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove gmocking + add another browser test Created 4 years, 6 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) 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 156 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
157 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 157 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
158 '<(DEPTH)/third_party/ots/ots.gyp:ots', 158 '<(DEPTH)/third_party/ots/ots.gyp:ots',
159 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 159 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
160 '<(DEPTH)/ui/gfx/gfx.gyp:gfx', 160 '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
161 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 161 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
162 '<(DEPTH)/url/url.gyp:url_lib', 162 '<(DEPTH)/url/url.gyp:url_lib',
163 '<(DEPTH)/url/url.gyp:url_interfaces_mojom_for_blink', 163 '<(DEPTH)/url/url.gyp:url_interfaces_mojom_for_blink',
164 '<(DEPTH)/v8/src/v8.gyp:v8', 164 '<(DEPTH)/v8/src/v8.gyp:v8',
165 '<(libjpeg_gyp_path):libjpeg', 165 '<(libjpeg_gyp_path):libjpeg',
166 '../../public/blink.gyp:mojo_bindings',
166 ], 167 ],
167 'export_dependent_settings': [ 168 'export_dependent_settings': [
168 'platform_generated.gyp:make_platform_generated', 169 'platform_generated.gyp:make_platform_generated',
169 '<(DEPTH)/base/base.gyp:base', 170 '<(DEPTH)/base/base.gyp:base',
170 '<(DEPTH)/cc/cc.gyp:cc', 171 '<(DEPTH)/cc/cc.gyp:cc',
171 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 172 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
172 '<(DEPTH)/skia/skia.gyp:skia', 173 '<(DEPTH)/skia/skia.gyp:skia',
173 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 174 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
174 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 175 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
175 '<(DEPTH)/third_party/ots/ots.gyp:ots', 176 '<(DEPTH)/third_party/ots/ots.gyp:ots',
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 ['OS=="android"', { 419 ['OS=="android"', {
419 'cflags!': ['-mthumb'], 420 'cflags!': ['-mthumb'],
420 }], 421 }],
421 ], 422 ],
422 },{ # target_arch!="arm" 423 },{ # target_arch!="arm"
423 'type': 'none', 424 'type': 'none',
424 }], 425 }],
425 ], 426 ],
426 }], 427 }],
427 } 428 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698