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

Side by Side Diff: media/media.gyp

Issue 835223006: Revert of linux/gyp: Find missing symbols at build time, not runtime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « gpu/gpu_config.gypi ('k') | media/media_cdm.gypi » ('j') | 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) 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 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 }], 752 }],
753 ['OS=="linux"', { 753 ['OS=="linux"', {
754 'conditions': [ 754 'conditions': [
755 ['use_x11==1', { 755 ['use_x11==1', {
756 'dependencies': [ 756 'dependencies': [
757 '../build/linux/system.gyp:x11', 757 '../build/linux/system.gyp:x11',
758 '../build/linux/system.gyp:xdamage', 758 '../build/linux/system.gyp:xdamage',
759 '../build/linux/system.gyp:xext', 759 '../build/linux/system.gyp:xext',
760 '../build/linux/system.gyp:xfixes', 760 '../build/linux/system.gyp:xfixes',
761 '../build/linux/system.gyp:xtst', 761 '../build/linux/system.gyp:xtst',
762 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
763 ], 762 ],
764 }, { # else: use_x11==0 763 }, { # else: use_x11==0
765 'sources!': [ 764 'sources!': [
766 'base/user_input_monitor_linux.cc', 765 'base/user_input_monitor_linux.cc',
767 ], 766 ],
768 'defines': [ 767 'defines': [
769 'DISABLE_USER_INPUT_MONITOR', 768 'DISABLE_USER_INPUT_MONITOR',
770 ], 769 ],
771 }], 770 }],
772 ['use_cras==1', { 771 ['use_cras==1', {
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1920 '../build/isolate.gypi', 1919 '../build/isolate.gypi',
1921 ], 1920 ],
1922 'sources': [ 1921 'sources': [
1923 'media_unittests.isolate', 1922 'media_unittests.isolate',
1924 ], 1923 ],
1925 }, 1924 },
1926 ], 1925 ],
1927 }], 1926 }],
1928 ], 1927 ],
1929 } 1928 }
OLDNEW
« no previous file with comments | « gpu/gpu_config.gypi ('k') | media/media_cdm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698