third_party/instrumented_libraries/instrumented_libraries.gyp - Issue 689113002: Instrumented libraries: partially fix pulseaudio build on Trusty.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 2 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 side-by-side diff with in-line comments

Download patch

Index: third_party/instrumented_libraries/instrumented_libraries.gyp

diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp

index f2e87b5d44ab3f9f6dd223dda988196591fc828d..805a3a1cfefef4da85ee169ea06624aa5df43f1a 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'],

« no previous file with comments | « no previous file | third_party/instrumented_libraries/patches/pulseaudio.diff » ('j') | no next file with comments »