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

Unified Diff: third_party/libvpx_new/libvpx.gyp

Issue 1484883002: clang/arm: Push -no-integrated-as into the four targets that need it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn 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 | « third_party/libvpx_new/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libvpx_new/libvpx.gyp
diff --git a/third_party/libvpx_new/libvpx.gyp b/third_party/libvpx_new/libvpx.gyp
index c9133618914a4eff498030062708ef7f262a108d..0ecfdf6b3287771016566f999b36e654440382c6 100644
--- a/third_party/libvpx_new/libvpx.gyp
+++ b/third_party/libvpx_new/libvpx.gyp
@@ -48,6 +48,18 @@
'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx_new',
},
'target_defaults': {
+ 'conditions': [
+ ['target_arch=="arm" and clang==1', {
+ # TODO(hans) Enable integrated-as (crbug.com/124610).
+ 'cflags': [ '-fno-integrated-as' ],
+ 'conditions': [
+ ['OS == "android"', {
+ # Else /usr/bin/as gets picked up.
+ 'cflags': [ '-B<(android_toolchain)' ],
+ }],
+ ],
+ }],
+ ],
'target_conditions': [
['<(libvpx_build_vp9)==0', {
'sources/': [ ['exclude', '(^|/)vp9/'], ],
« no previous file with comments | « third_party/libvpx_new/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698