diff options
| author | earthdok <earthdok@chromium.org> | 2014-10-31 08:27:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-31 15:27:31 +0000 |
| commit | 630a9ee3a52c9e4fa972438517905cb815525ad3 (patch) | |
| tree | 4c9e061cce77a3ae7345c4cf8fdea122c2914894 /third_party/instrumented_libraries/instrumented_libraries.gyp | |
| parent | f30c72a15d17a94b20380ab11ae81c591251e9ec (diff) | |
| download | chromium_src-630a9ee3a52c9e4fa972438517905cb815525ad3.zip chromium_src-630a9ee3a52c9e4fa972438517905cb815525ad3.tar.gz chromium_src-630a9ee3a52c9e4fa972438517905cb815525ad3.tar.bz2 | |
Instrumented libraries: partially fix pulseaudio build on Trusty.
BUG=414189
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/689113002
Cr-Commit-Position: refs/heads/master@{#302268}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index f2e87b5..805a3a1 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -418,7 +418,19 @@ { 'package_name': 'pulseaudio', 'dependencies=': [], - 'patch': 'patches/pulseaudio.diff', + 'conditions': [ + ['"<(_ubuntu_release)"=="precise"', { + 'patch': 'patches/pulseaudio.precise.diff', + }], + ], + 'extra_configure_flags': [ + # From debian/rules. + '--enable-x11', + '--disable-hal-compat', + # Disable some ARM-related code that fails compilation. No idea why + # this even impacts x86-64 builds. + '--disable-neon-opt' + ], 'run_before_build': 'scripts/pulseaudio.sh', 'jobs': 1, 'includes': ['standard_instrumented_package_target.gypi'], |