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

Side by Side Diff: content/content_tests.gypi

Issue 902773003: Revert of Clean up V4L2 codec-related flags and defines (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « content/content_common.gypi ('k') | 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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'variables': { 6 'variables': {
7 'use_v4lplugin%': 0,
7 'layouttest_support_content_sources': [ 8 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 9 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 10 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 11 'public/test/nested_message_pump_android.h',
11 'test/layouttest_support.cc', 12 'test/layouttest_support.cc',
12 'test/test_media_stream_renderer_factory.cc', 13 'test/test_media_stream_renderer_factory.cc',
13 'test/test_media_stream_renderer_factory.h', 14 'test/test_media_stream_renderer_factory.h',
14 'test/test_video_frame_provider.cc', 15 'test/test_video_frame_provider.cc',
15 'test/test_video_frame_provider.h', 16 'test/test_video_frame_provider.h',
16 ], 17 ],
(...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after
1603 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c 1604 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c
1604 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 1605 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
1605 ], 1606 ],
1606 }], 1607 }],
1607 ['use_ozone==1 and chromeos==1', { 1608 ['use_ozone==1 and chromeos==1', {
1608 'dependencies': [ 1609 'dependencies': [
1609 '../ui/display/display.gyp:display', # Used by rendering_helpe r.cc 1610 '../ui/display/display.gyp:display', # Used by rendering_helpe r.cc
1610 '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helpe r.cc 1611 '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helpe r.cc
1611 ], 1612 ],
1612 }], 1613 }],
1614 ['use_v4lplugin==1', {
1615 'defines': ['USE_LIBV4L2'],
1616 }],
1613 ], 1617 ],
1614 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1618 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1615 'msvs_disabled_warnings': [ 4267, ], 1619 'msvs_disabled_warnings': [ 4267, ],
1616 }, 1620 },
1617 ] 1621 ]
1618 }], 1622 }],
1619 ['chromeos==1 and target_arch != "arm"', { 1623 ['chromeos==1 and target_arch != "arm"', {
1620 'targets': [ 1624 'targets': [
1621 { 1625 {
1622 'target_name': 'vaapi_h264_decoder_unittest', 1626 'target_name': 'vaapi_h264_decoder_unittest',
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 2100 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
2097 }, 2101 },
2098 ], 2102 ],
2099 }], 2103 }],
2100 ], 2104 ],
2101 }, 2105 },
2102 ], 2106 ],
2103 }], 2107 }],
2104 ], 2108 ],
2105 } 2109 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698