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

Side by Side Diff: media/media.gyp

Issue 244593002: pkg-config-wrapper: use system_libdir for libpath (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
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 19 matching lines...) Expand all
30 'use_pulseaudio%': 0, 30 'use_pulseaudio%': 0,
31 }, { 31 }, {
32 'use_pulseaudio%': 1, 32 'use_pulseaudio%': 1,
33 }], 33 }],
34 ], 34 ],
35 }, { 35 }, {
36 'use_alsa%': 0, 36 'use_alsa%': 0,
37 'use_pulseaudio%': 0, 37 'use_pulseaudio%': 0,
38 }], 38 }],
39 ['sysroot!=""', { 39 ['sysroot!=""', {
40 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_ arch)"', 40 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_ arch)" "<(system_libdir)"',
41 }, { 41 }, {
42 'pkg-config': 'pkg-config' 42 'pkg-config': 'pkg-config'
43 }], 43 }],
44 ], 44 ],
45 }, 45 },
46 'includes': [ 46 'includes': [
47 'media_cdm.gypi', 47 'media_cdm.gypi',
48 ], 48 ],
49 'targets': [ 49 'targets': [
50 { 50 {
(...skipping 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after
1681 ], 1681 ],
1682 }], 1682 }],
1683 ], 1683 ],
1684 }], 1684 }],
1685 ], 1685 ],
1686 }, 1686 },
1687 ], 1687 ],
1688 }], 1688 }],
1689 ], 1689 ],
1690 } 1690 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698