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

Side by Side Diff: media/media.gyp

Issue 1154213004: Revert of Fix use of 'sysroot' variable in harfbuzz.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | net/third_party/nss/ssl.gyp » ('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 17 matching lines...) Expand all
28 ['use_cras==1', { 28 ['use_cras==1', {
29 'use_pulseaudio%': 0, 29 'use_pulseaudio%': 0,
30 }, { 30 }, {
31 'use_pulseaudio%': 1, 31 'use_pulseaudio%': 1,
32 }], 32 }],
33 ], 33 ],
34 }, { 34 }, {
35 'use_alsa%': 0, 35 'use_alsa%': 0,
36 'use_pulseaudio%': 0, 36 'use_pulseaudio%': 0,
37 }], 37 }],
38 ['sysroot!=""', {
39 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_ arch)" "<(system_libdir)"',
40 }, {
41 'pkg-config': 'pkg-config'
42 }],
38 # low memory buffer is used in non-Android based chromecast build due to h ardware limitation. 43 # low memory buffer is used in non-Android based chromecast build due to h ardware limitation.
39 ['chromecast==1 and OS!="android"', { 44 ['chromecast==1 and OS!="android"', {
40 'use_low_memory_buffer%': 1, 45 'use_low_memory_buffer%': 1,
41 }, { 46 }, {
42 'use_low_memory_buffer%': 0, 47 'use_low_memory_buffer%': 0,
43 }], 48 }],
44 ], 49 ],
45 }, 50 },
46 'includes': [ 51 'includes': [
47 'media_cdm.gypi', 52 'media_cdm.gypi',
(...skipping 1916 matching lines...) Expand 10 before | Expand all | Expand 10 after
1964 'dependencies': [ 1969 'dependencies': [
1965 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1970 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1966 ], 1971 ],
1967 }], 1972 }],
1968 ], 1973 ],
1969 }, 1974 },
1970 ], 1975 ],
1971 }], 1976 }],
1972 ], 1977 ],
1973 } 1978 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | net/third_party/nss/ssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698