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

Side by Side Diff: third_party/instrumented_libraries/instrumented_libraries.gyp

Issue 714963002: Instrumented libraries: fix pulseaudio build on Trusty. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enable parallel build Created 6 years, 1 month 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 | third_party/instrumented_libraries/scripts/pulseaudio.sh » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'verbose_libraries_build%': 0, 7 'verbose_libraries_build%': 0,
8 'instrumented_libraries_jobs%': 1, 8 'instrumented_libraries_jobs%': 1,
9 }, 9 },
10 10
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 'patch': 'patches/nss.diff', 415 'patch': 'patches/nss.diff',
416 'build_method': 'custom_nss', 416 'build_method': 'custom_nss',
417 'includes': ['standard_instrumented_package_target.gypi'], 417 'includes': ['standard_instrumented_package_target.gypi'],
418 }, 418 },
419 { 419 {
420 'package_name': 'pulseaudio', 420 'package_name': 'pulseaudio',
421 'dependencies=': [], 421 'dependencies=': [],
422 'conditions': [ 422 'conditions': [
423 ['"<(_ubuntu_release)"=="precise"', { 423 ['"<(_ubuntu_release)"=="precise"', {
424 'patch': 'patches/pulseaudio.precise.diff', 424 'patch': 'patches/pulseaudio.precise.diff',
425 'jobs': 1,
425 }], 426 }],
426 ], 427 ],
427 'extra_configure_flags': [ 428 'extra_configure_flags': [
428 # From debian/rules. 429 # From debian/rules.
429 '--enable-x11', 430 '--enable-x11',
430 '--disable-hal-compat', 431 '--disable-hal-compat',
431 # Disable some ARM-related code that fails compilation. No idea why 432 # Disable some ARM-related code that fails compilation. No idea why
432 # this even impacts x86-64 builds. 433 # this even impacts x86-64 builds.
433 '--disable-neon-opt' 434 '--disable-neon-opt'
434 ], 435 ],
435 'run_before_build': 'scripts/pulseaudio.sh', 436 'run_before_build': 'scripts/pulseaudio.sh',
436 'jobs': 1,
437 'includes': ['standard_instrumented_package_target.gypi'], 437 'includes': ['standard_instrumented_package_target.gypi'],
438 }, 438 },
439 { 439 {
440 'package_name': 'libasound2', 440 'package_name': 'libasound2',
441 'dependencies=': [], 441 'dependencies=': [],
442 'run_before_build': 'scripts/libasound2.sh', 442 'run_before_build': 'scripts/libasound2.sh',
443 'includes': ['standard_instrumented_package_target.gypi'], 443 'includes': ['standard_instrumented_package_target.gypi'],
444 }, 444 },
445 { 445 {
446 'package_name': 'libcups2', 446 'package_name': 'libcups2',
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 'extra_configure_flags': [ 662 'extra_configure_flags': [
663 # See above. 663 # See above.
664 '--disable-introspection', 664 '--disable-introspection',
665 ], 665 ],
666 'dependencies=': [], 666 'dependencies=': [],
667 'run_before_build': 'scripts/autogen.sh', 667 'run_before_build': 'scripts/autogen.sh',
668 'includes': ['standard_instrumented_package_target.gypi'], 668 'includes': ['standard_instrumented_package_target.gypi'],
669 }, 669 },
670 ], 670 ],
671 } 671 }
OLDNEW
« no previous file with comments | « no previous file | third_party/instrumented_libraries/scripts/pulseaudio.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698