dl/dl.gyp - Issue 1486143002: Only pass android_toolchain in android builds.

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: dl/dl.gyp

Issue 1486143002: Only pass android_toolchain in android builds. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc/deps/third_party/openmax.git@master

Patch Set: . Created 5 years 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: dl/dl.gyp

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

index 84b844f0012b7d661f3d8b3a465129596ae86817..2b0826fe14342d96037d18ada342501b754829aa 100644

--- a/dl/dl.gyp

+++ b/dl/dl.gyp

@@ -21,9 +21,12 @@

'conditions' : [

['clang==1', {

# TODO(hans) Enable integrated-as (crbug.com/124610).

- 'cflags': [

- '-fno-integrated-as',

- '-B<(android_toolchain)', # Else /usr/bin/as gets picked up.

+ 'cflags': [ '-fno-integrated-as' ],

+ 'conditions': [

+ ['OS == "android"', {

+ # Else /usr/bin/as gets picked up.

+ 'cflags': [ '-B<(android_toolchain)' ],

+ }],

}],

['arm_neon==1', {

« no previous file with comments | « dl/BUILD.gn ('k') | no next file » | no next file with comments »