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

Side by Side Diff: tools/emacs/testdata/media.gyp

Issue 246343002: pkg-config-wrapper: use system_libdir for libpath (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
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
« no previous file with comments | « no previous file | tools/emacs/testdata/media.gyp.fontified » ('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 PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 ['OS!="openbsd"', { 368 ['OS!="openbsd"', {
369 'sources!': [ 369 'sources!': [
370 'audio/openbsd/audio_manager_openbsd.cc', 370 'audio/openbsd/audio_manager_openbsd.cc',
371 'audio/openbsd/audio_manager_openbsd.h', 371 'audio/openbsd/audio_manager_openbsd.h',
372 ], 372 ],
373 }], 373 }],
374 ['OS=="linux"', { 374 ['OS=="linux"', {
375 'variables': { 375 'variables': {
376 'conditions': [ 376 'conditions': [
377 ['sysroot!=""', { 377 ['sysroot!=""', {
378 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "< (target_arch)"', 378 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "< (target_arch)" "<(system_libdir)"',
379 }, { 379 }, {
380 'pkg-config': 'pkg-config' 380 'pkg-config': 'pkg-config'
381 }], 381 }],
382 ], 382 ],
383 }, 383 },
384 'conditions': [ 384 'conditions': [
385 ['use_cras == 1', { 385 ['use_cras == 1', {
386 'cflags': [ 386 'cflags': [
387 '<!@(<(pkg-config) --cflags libcras)', 387 '<!@(<(pkg-config) --cflags libcras)',
388 ], 388 ],
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1096 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1097 ], 1097 ],
1098 'sources': [ 1098 'sources': [
1099 'tools/media_bench/media_bench.cc', 1099 'tools/media_bench/media_bench.cc',
1100 ], 1100 ],
1101 }, 1101 },
1102 ], 1102 ],
1103 }] 1103 }]
1104 ], 1104 ],
1105 } 1105 }
OLDNEW
« no previous file with comments | « no previous file | tools/emacs/testdata/media.gyp.fontified » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698