| OLD | NEW | 
|---|
| 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 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1660             '..', | 1660             '..', | 
| 1661           ], | 1661           ], | 
| 1662           'sources': [ | 1662           'sources': [ | 
| 1663             'base/simd/convert_rgb_to_yuv_sse2.cc', | 1663             'base/simd/convert_rgb_to_yuv_sse2.cc', | 
| 1664             'base/simd/convert_rgb_to_yuv_ssse3.cc', | 1664             'base/simd/convert_rgb_to_yuv_ssse3.cc', | 
| 1665             'base/simd/filter_yuv_sse2.cc', | 1665             'base/simd/filter_yuv_sse2.cc', | 
| 1666           ], | 1666           ], | 
| 1667         }, | 1667         }, | 
| 1668       ], # targets | 1668       ], # targets | 
| 1669     }], | 1669     }], | 
|  | 1670     ['use_x11==1', { | 
|  | 1671       'targets': [ | 
|  | 1672         { | 
|  | 1673           'target_name': 'player_x11', | 
|  | 1674           'type': 'executable', | 
|  | 1675           'dependencies': [ | 
|  | 1676             'media', | 
|  | 1677             'shared_memory_support', | 
|  | 1678             '../base/base.gyp:base', | 
|  | 1679             '../ui/gl/gl.gyp:gl', | 
|  | 1680             '../ui/gfx/gfx.gyp:gfx', | 
|  | 1681             '../ui/gfx/gfx.gyp:gfx_geometry', | 
|  | 1682             '../build/linux/system.gyp:x11', | 
|  | 1683             '../build/linux/system.gyp:xext', | 
|  | 1684             '../build/linux/system.gyp:xrender', | 
|  | 1685           ], | 
|  | 1686           'conditions': [ | 
|  | 1687             # Linux/Solaris need libdl for dlopen() and friends. | 
|  | 1688             ['OS=="linux" or OS=="solaris"', { | 
|  | 1689               'link_settings': { | 
|  | 1690                 'libraries': [ | 
|  | 1691                   '-ldl', | 
|  | 1692                 ], | 
|  | 1693               }, | 
|  | 1694             }], | 
|  | 1695           ], | 
|  | 1696           'sources': [ | 
|  | 1697             'tools/player_x11/data_source_logger.cc', | 
|  | 1698             'tools/player_x11/data_source_logger.h', | 
|  | 1699             'tools/player_x11/gl_video_renderer.cc', | 
|  | 1700             'tools/player_x11/gl_video_renderer.h', | 
|  | 1701             'tools/player_x11/player_x11.cc', | 
|  | 1702             'tools/player_x11/x11_video_renderer.cc', | 
|  | 1703             'tools/player_x11/x11_video_renderer.h', | 
|  | 1704           ], | 
|  | 1705         }, | 
|  | 1706       ], | 
|  | 1707     }], | 
| 1670     ['OS=="android"', { | 1708     ['OS=="android"', { | 
| 1671       'targets': [ | 1709       'targets': [ | 
| 1672         { | 1710         { | 
| 1673           # TODO(GN) | 1711           # TODO(GN) | 
| 1674           'target_name': 'media_unittests_apk', | 1712           'target_name': 'media_unittests_apk', | 
| 1675           'type': 'none', | 1713           'type': 'none', | 
| 1676           'dependencies': [ | 1714           'dependencies': [ | 
| 1677             'media_java', | 1715             'media_java', | 
| 1678             'media_unittests', | 1716             'media_unittests', | 
| 1679           ], | 1717           ], | 
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1948             '../build/isolate.gypi', | 1986             '../build/isolate.gypi', | 
| 1949           ], | 1987           ], | 
| 1950           'sources': [ | 1988           'sources': [ | 
| 1951             'media_unittests.isolate', | 1989             'media_unittests.isolate', | 
| 1952           ], | 1990           ], | 
| 1953         }, | 1991         }, | 
| 1954       ], | 1992       ], | 
| 1955     }], | 1993     }], | 
| 1956   ], | 1994   ], | 
| 1957 } | 1995 } | 
| OLD | NEW | 
|---|