| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'variables': { | 5 'variables': { |
| 6 'libvpx_build_vp9%': 1, | 6 'libvpx_build_vp9%': 1, |
| 7 'libvpx_source%': 'source/libvpx', | 7 'libvpx_source%': 'source/libvpx', |
| 8 # Disable LTO for neon targets | 8 # Disable LTO for neon targets |
| 9 # crbug.com/408997 | 9 # crbug.com/408997 |
| 10 'use_lto%': 0, | 10 'use_lto%': 0, |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 'OS_CATEGORY%': 'linux', | 41 'OS_CATEGORY%': 'linux', |
| 42 }, { | 42 }, { |
| 43 'OS_CATEGORY%': '<(OS)', | 43 'OS_CATEGORY%': '<(OS)', |
| 44 }], | 44 }], |
| 45 ], | 45 ], |
| 46 | 46 |
| 47 # Location of the intermediate output. | 47 # Location of the intermediate output. |
| 48 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx_new', | 48 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx_new', |
| 49 }, | 49 }, |
| 50 'target_defaults': { | 50 'target_defaults': { |
| 51 'conditions': [ |
| 52 ['target_arch=="arm" and clang==1', { |
| 53 # TODO(hans) Enable integrated-as (crbug.com/124610). |
| 54 'cflags': [ '-fno-integrated-as' ], |
| 55 'conditions': [ |
| 56 ['OS == "android"', { |
| 57 # Else /usr/bin/as gets picked up. |
| 58 'cflags': [ '-B<(android_toolchain)' ], |
| 59 }], |
| 60 ], |
| 61 }], |
| 62 ], |
| 51 'target_conditions': [ | 63 'target_conditions': [ |
| 52 ['<(libvpx_build_vp9)==0', { | 64 ['<(libvpx_build_vp9)==0', { |
| 53 'sources/': [ ['exclude', '(^|/)vp9/'], ], | 65 'sources/': [ ['exclude', '(^|/)vp9/'], ], |
| 54 }], | 66 }], |
| 55 ], | 67 ], |
| 56 'variables': { | 68 'variables': { |
| 57 'conditions': [ | 69 'conditions': [ |
| 58 ['OS=="win"', { | 70 ['OS=="win"', { |
| 59 'optimize' :'max', | 71 'optimize' :'max', |
| 60 }], | 72 }], |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 '-fstack-protector-all', # Implies -fstack-protector | 291 '-fstack-protector-all', # Implies -fstack-protector |
| 280 ], | 292 ], |
| 281 }, | 293 }, |
| 282 }], | 294 }], |
| 283 ], | 295 ], |
| 284 }, | 296 }, |
| 285 ], | 297 ], |
| 286 }], | 298 }], |
| 287 ], | 299 ], |
| 288 } | 300 } |
| OLD | NEW |