build/common.gypi - Issue 387023: Building FFmpeg in tree for arm

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: build/common.gypi

Issue 387023: Building FFmpeg in tree for arm (Closed)

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

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 1cc8cca1d1fbf928ff194e1e0feeb683366b471c..a73c75fad2c764badd65ac279b03ae2f1fd7f242 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -670,13 +670,17 @@

}],

['target_arch=="arm"', {

- 'target_conditions': [

- ['armv7==1 and _toolset=="target"', {

- 'cflags': [

- '-march=armv7-a',

- '-mtune=cortex-a8',

- '-mfpu=neon',

- '-mfloat-abi=softfp',

+ 'conditions': [

+ ['armv7==1', {

+ 'target_conditions': [

+ ['_toolset=="target"', {

+ 'cflags': [

+ '-march=armv7-a',

+ '-mtune=cortex-a8',

+ '-mfpu=neon',

+ '-mfloat-abi=softfp',

+ ],

+ }],

}],

« no previous file with comments | « build/all.gyp ('k') | third_party/ffmpeg/ffmpeg.gyp » ('j') | no next file with comments »