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

Side by Side Diff: content/content_common.gypi

Issue 16430003: Remove linux x86 from HW video decode black list Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../media/media.gyp:media', 9 '../media/media.gyp:media',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 '<(DEPTH)/third_party/khronos', 489 '<(DEPTH)/third_party/khronos',
490 '<(DEPTH)/third_party/openmax/il', 490 '<(DEPTH)/third_party/openmax/il',
491 ], 491 ],
492 'link_settings': { 492 'link_settings': {
493 'libraries': [ 493 'libraries': [
494 '-lEGL', 494 '-lEGL',
495 '-lGLESv2', 495 '-lGLESv2',
496 ], 496 ],
497 }, 497 },
498 }], 498 }],
499 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 499 ['target_arch != "arm" and use_x11 == 1', {
500 'sources': [ 500 'sources': [
501 'common/gpu/media/h264_dpb.cc', 501 'common/gpu/media/h264_dpb.cc',
502 'common/gpu/media/h264_dpb.h', 502 'common/gpu/media/h264_dpb.h',
503 'common/gpu/media/va_surface.h', 503 'common/gpu/media/va_surface.h',
504 'common/gpu/media/vaapi_h264_decoder.cc', 504 'common/gpu/media/vaapi_h264_decoder.cc',
505 'common/gpu/media/vaapi_h264_decoder.h', 505 'common/gpu/media/vaapi_h264_decoder.h',
506 'common/gpu/media/vaapi_video_decode_accelerator.cc', 506 'common/gpu/media/vaapi_video_decode_accelerator.cc',
507 'common/gpu/media/vaapi_video_decode_accelerator.h', 507 'common/gpu/media/vaapi_video_decode_accelerator.h',
508 'common/gpu/media/vaapi_wrapper.cc', 508 'common/gpu/media/vaapi_wrapper.cc',
509 'common/gpu/media/vaapi_wrapper.h', 509 'common/gpu/media/vaapi_wrapper.h',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 565 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
566 '<(output)', 566 '<(output)',
567 '<(PRODUCT_DIR)', 567 '<(PRODUCT_DIR)',
568 ], 568 ],
569 'msvs_cygwin_shell': 1, 569 'msvs_cygwin_shell': 1,
570 }, 570 },
571 ] 571 ]
572 }], 572 }],
573 ], 573 ],
574 } 574 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698