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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/content_tests.gypi

Issue 357903003: Revert 279958 "Revert "Revert 279650 "Add VaapiVideoEncodeAccele..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/content/content_common.gypi ('k') | trunk/src/content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/content_tests.gypi
===================================================================
--- trunk/src/content/content_tests.gypi (revision 280019)
+++ trunk/src/content/content_tests.gypi (working copy)
@@ -1468,7 +1468,7 @@
},
]
}],
- ['chromeos==1 and (target_arch == "arm" or use_x11 == 1)', {
+ ['chromeos==1 and target_arch == "arm"', {
'targets': [
{
'target_name': 'video_encode_accelerator_unittest',
@@ -1488,17 +1488,6 @@
'common/gpu/media/video_accelerator_unittest_helpers.h',
'common/gpu/media/video_encode_accelerator_unittest.cc',
],
- 'include_dirs': [
- '<(DEPTH)/third_party/libva',
- '<(DEPTH)/third_party/libyuv',
- ],
- 'conditions': [
- ['use_x11==1', {
- 'dependencies': [
- '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
- ],
- }],
- ],
},
]
}],
« no previous file with comments | « trunk/src/content/content_common.gypi ('k') | trunk/src/content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698