ffmpeg.gyp - Issue 14402006: Add target_arch check.

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: ffmpeg.gyp

Issue 14402006: Add target_arch check. (Closed) Base URL: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@master

Patch Set: Created 7 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:

Index: ffmpeg.gyp

diff --git a/ffmpeg.gyp b/ffmpeg.gyp

index b044ce7ae8556fac3c30dc5a24c0f4684a3e36f2..4d382db3ab71c028067454f63743f21e24d83f5b 100644

--- a/ffmpeg.gyp

+++ b/ffmpeg.gyp

@@ -40,7 +40,7 @@

# Allow overriding the selection of which FFmpeg binaries to copy via an

# environment variable. Affects the ffmpeg_binaries target.

'conditions': [

- ['armv7 == 1 and arm_neon == 1', {

+ ['target_arch == "arm" and armv7 == 1 and arm_neon == 1', {

# Need a separate config for arm+neon vs arm

'ffmpeg_config%': 'arm-neon',

}, {

« no previous file with comments | « no previous file | no next file » | no next file with comments »