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

Side by Side Diff: content/content_common.gypi

Issue 8776009: Chrome for arm seems to make the implicit assumption that (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years 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 | 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 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../build/temp_gyp/googleurl.gyp:googleurl', 8 '../build/temp_gyp/googleurl.gyp:googleurl',
9 '../gpu/gpu.gyp:gpu_ipc', 9 '../gpu/gpu.gyp:gpu_ipc',
10 '../ipc/ipc.gyp:ipc', 10 '../ipc/ipc.gyp:ipc',
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 ], 285 ],
286 'include_dirs': [ 286 'include_dirs': [
287 '<(DEPTH)/third_party/angle/include', 287 '<(DEPTH)/third_party/angle/include',
288 ], 288 ],
289 'link_settings': { 289 'link_settings': {
290 'libraries': [ 290 'libraries': [
291 '-lXcomposite', 291 '-lXcomposite',
292 ], 292 ],
293 }, 293 },
294 }], 294 }],
295 ['use_x11 == 1 and target_arch != "arm"', { 295 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
296 'sources': [ 296 'sources': [
297 'common/gpu/x_util.cc', 297 'common/gpu/x_util.cc',
298 'common/gpu/x_util.h', 298 'common/gpu/x_util.h',
299 ], 299 ],
300 }], 300 }],
301 ['enable_gpu==1', { 301 ['enable_gpu==1', {
302 'dependencies': [ 302 'dependencies': [
303 '../gpu/gpu.gyp:command_buffer_service', 303 '../gpu/gpu.gyp:command_buffer_service',
304 ], 304 ],
305 }], 305 }],
306 ['target_arch=="arm"', { 306 ['target_arch=="arm" and chromeos == 1', {
307 'dependencies': [ 307 'dependencies': [
308 '../media/media.gyp:media', 308 '../media/media.gyp:media',
309 ], 309 ],
310 'sources': [ 310 'sources': [
311 'common/gpu/media/gles2_texture_to_egl_image_translator.cc', 311 'common/gpu/media/gles2_texture_to_egl_image_translator.cc',
312 'common/gpu/media/gles2_texture_to_egl_image_translator.h', 312 'common/gpu/media/gles2_texture_to_egl_image_translator.h',
313 'common/gpu/media/omx_video_decode_accelerator.cc', 313 'common/gpu/media/omx_video_decode_accelerator.cc',
314 'common/gpu/media/omx_video_decode_accelerator.h', 314 'common/gpu/media/omx_video_decode_accelerator.h',
315 ], 315 ],
316 'include_dirs': [ 316 'include_dirs': [
(...skipping 26 matching lines...) Expand all
343 '../build/extract_from_cab.py', 343 '../build/extract_from_cab.py',
344 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 344 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
345 '<(output)', 345 '<(output)',
346 '<(PRODUCT_DIR)', 346 '<(PRODUCT_DIR)',
347 ], 347 ],
348 }, 348 },
349 ] 349 ]
350 }] 350 }]
351 ], 351 ],
352 } 352 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698