Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2472)

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
« no previous file with comments | « dl/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 »

Powered by Google App Engine
This is Rietveld 408576698