Chromium Code Reviews| 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..edc87ab6a6a7ab3d2b8fbb0542ae55675ce20013 100644 |
| --- a/third_party/libvpx_new/libvpx.gyp |
| +++ b/third_party/libvpx_new/libvpx.gyp |
| @@ -48,6 +48,15 @@ |
| '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). |
|
Johann
2015/12/01 15:26:18
We can generate clang-specific assembly. The issue
Nico
2015/12/01 15:32:28
clang's intentions are to support UAL from what I
|
| + 'cflags': [ |
| + '-fno-integrated-as', |
| + '-B<(android_toolchain)', # Else /usr/bin/as gets picked up. |
| + ], |
| + }], |
| + ], |
| 'target_conditions': [ |
| ['<(libvpx_build_vp9)==0', { |
| 'sources/': [ ['exclude', '(^|/)vp9/'], ], |