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

Side by Side Diff: media/media.gyp

Issue 1403893007: Adding third_party/openh264/src, build files and unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 1 month 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 'formats/webm/webm_content_encodings_client_unittest.cc', 1306 'formats/webm/webm_content_encodings_client_unittest.cc',
1307 'formats/webm/webm_parser_unittest.cc', 1307 'formats/webm/webm_parser_unittest.cc',
1308 'formats/webm/webm_tracks_parser_unittest.cc', 1308 'formats/webm/webm_tracks_parser_unittest.cc',
1309 'formats/webm/webm_webvtt_parser_unittest.cc', 1309 'formats/webm/webm_webvtt_parser_unittest.cc',
1310 'renderers/audio_renderer_impl_unittest.cc', 1310 'renderers/audio_renderer_impl_unittest.cc',
1311 'renderers/renderer_impl_unittest.cc', 1311 'renderers/renderer_impl_unittest.cc',
1312 'renderers/skcanvas_video_renderer_unittest.cc', 1312 'renderers/skcanvas_video_renderer_unittest.cc',
1313 'renderers/video_renderer_impl_unittest.cc', 1313 'renderers/video_renderer_impl_unittest.cc',
1314 'test/pipeline_integration_test.cc', 1314 'test/pipeline_integration_test.cc',
1315 'test/pipeline_integration_test_base.cc', 1315 'test/pipeline_integration_test_base.cc',
1316 'video/gpu_memory_buffer_video_frame_pool_unittest.cc',
torbjorng 2015/11/05 13:18:25 Is this change intentional?
hbos_chromium 2015/11/10 14:36:47 That's due to rebase with master
1316 'video/h264_poc_unittest.cc', 1317 'video/h264_poc_unittest.cc',
1317 'video/gpu_memory_buffer_video_frame_pool_unittest.cc',
1318 ], 1318 ],
1319 'include_dirs': [ 1319 'include_dirs': [
1320 # Needed by media_drm_bridge.cc. 1320 # Needed by media_drm_bridge.cc.
1321 '<(SHARED_INTERMEDIATE_DIR)', 1321 '<(SHARED_INTERMEDIATE_DIR)',
1322 ], 1322 ],
1323 'conditions': [ 1323 'conditions': [
1324 ['arm_neon==1', { 1324 ['arm_neon==1', {
1325 'defines': [ 1325 'defines': [
1326 'USE_NEON' 1326 'USE_NEON'
1327 ], 1327 ],
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
2115 'dependencies': [ 2115 'dependencies': [
2116 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2116 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2117 ], 2117 ],
2118 }], 2118 }],
2119 ], 2119 ],
2120 }, 2120 },
2121 ], 2121 ],
2122 }], 2122 }],
2123 ], 2123 ],
2124 } 2124 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698