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

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

Issue 689113002: Instrumented libraries: partially fix pulseaudio build on Trusty. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/patches/pulseaudio.diff » ('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 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 # TODO(earthdok): get rid of this dependency 411 # TODO(earthdok): get rid of this dependency
412 '<(_sanitizer_type)-libnspr4', 412 '<(_sanitizer_type)-libnspr4',
413 ], 413 ],
414 'patch': 'patches/nss.diff', 414 'patch': 'patches/nss.diff',
415 'build_method': 'custom_nss', 415 'build_method': 'custom_nss',
416 'includes': ['standard_instrumented_package_target.gypi'], 416 'includes': ['standard_instrumented_package_target.gypi'],
417 }, 417 },
418 { 418 {
419 'package_name': 'pulseaudio', 419 'package_name': 'pulseaudio',
420 'dependencies=': [], 420 'dependencies=': [],
421 'patch': 'patches/pulseaudio.diff', 421 'conditions': [
422 ['"<(_ubuntu_release)"=="precise"', {
423 'patch': 'patches/pulseaudio.precise.diff',
424 }],
425 ],
426 'extra_configure_flags': [
427 # From debian/rules.
428 '--enable-x11',
429 '--disable-hal-compat',
430 # Disable some ARM-related code that fails compilation. No idea why
431 # this even impacts x86-64 builds.
432 '--disable-neon-opt'
433 ],
422 'run_before_build': 'scripts/pulseaudio.sh', 434 'run_before_build': 'scripts/pulseaudio.sh',
423 'jobs': 1, 435 'jobs': 1,
424 'includes': ['standard_instrumented_package_target.gypi'], 436 'includes': ['standard_instrumented_package_target.gypi'],
425 }, 437 },
426 { 438 {
427 'package_name': 'libasound2', 439 'package_name': 'libasound2',
428 'dependencies=': [], 440 'dependencies=': [],
429 'run_before_build': 'scripts/libasound2.sh', 441 'run_before_build': 'scripts/libasound2.sh',
430 'includes': ['standard_instrumented_package_target.gypi'], 442 'includes': ['standard_instrumented_package_target.gypi'],
431 }, 443 },
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 'extra_configure_flags': [ 661 'extra_configure_flags': [
650 # See above. 662 # See above.
651 '--disable-introspection', 663 '--disable-introspection',
652 ], 664 ],
653 'dependencies=': [], 665 'dependencies=': [],
654 'run_before_build': 'scripts/autogen.sh', 666 'run_before_build': 'scripts/autogen.sh',
655 'includes': ['standard_instrumented_package_target.gypi'], 667 'includes': ['standard_instrumented_package_target.gypi'],
656 }, 668 },
657 ], 669 ],
658 } 670 }
OLDNEW
« no previous file with comments | « no previous file | third_party/instrumented_libraries/patches/pulseaudio.diff » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698