Chromium Code Reviews| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'conditions': [ | 7 'conditions': [ |
| 8 ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64"', { | 8 ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64"', { |
| 9 'use_opus_fixed_point%': 1, | 9 'use_opus_fixed_point%': 1, |
| 10 }, { | 10 }, { |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 33 'include_dirs': [ | 33 'include_dirs': [ |
| 34 'src/celt', | 34 'src/celt', |
| 35 'src/include', | 35 'src/include', |
| 36 'src/silk', | 36 'src/silk', |
| 37 ], | 37 ], |
| 38 'direct_dependent_settings': { | 38 'direct_dependent_settings': { |
| 39 'include_dirs': [ | 39 'include_dirs': [ |
| 40 'src/include', | 40 'src/include', |
| 41 ], | 41 ], |
| 42 }, | 42 }, |
| 43 'includes': ['opus_srcs.gypi', ], | 43 'includes': [ |
| 44 'opus_srcs.gypi', | |
| 45 # Disable LTO due to ELF section name out of range | |
| 46 # crbug.com/422251 | |
| 47 '../../build/android/disable_lto.gypi', | |
| 48 ], | |
| 44 'sources': ['<@(opus_common_sources)'], | 49 'sources': ['<@(opus_common_sources)'], |
| 45 'conditions': [ | 50 'conditions': [ |
| 46 ['OS!="win"', { | 51 ['OS!="win"', { |
| 47 'defines': [ | 52 'defines': [ |
| 48 'HAVE_LRINT', | 53 'HAVE_LRINT', |
| 49 'HAVE_LRINTF', | 54 'HAVE_LRINTF', |
| 50 'VAR_ARRAYS', | 55 'VAR_ARRAYS', |
| 51 ], | 56 ], |
| 52 }, { | 57 }, { |
| 53 'defines': [ | 58 'defines': [ |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 ], | 99 ], |
| 95 'sources': ['<@(opus_fixed_sources)'], | 100 'sources': ['<@(opus_fixed_sources)'], |
| 96 'conditions': [ | 101 'conditions': [ |
| 97 ['use_opus_arm_optimization==1', { | 102 ['use_opus_arm_optimization==1', { |
| 98 'defines': [ | 103 'defines': [ |
| 99 'OPUS_ARM_ASM', | 104 'OPUS_ARM_ASM', |
| 100 'OPUS_ARM_INLINE_ASM', | 105 'OPUS_ARM_INLINE_ASM', |
| 101 'OPUS_ARM_INLINE_EDSP', | 106 'OPUS_ARM_INLINE_EDSP', |
| 102 ], | 107 ], |
| 103 'includes': [ | 108 'includes': [ |
| 104 'opus_srcs_arm.gypi', | 109 'opus_srcs_arm.gypi', |
|
tlegrand1
2014/10/11 08:23:21
Not needed here?
Fabrice (no longer in Chrome)
2014/10/13 15:45:12
No, LTO just is very brittle.
What happens is that
| |
| 105 ], | 110 ], |
| 106 'conditions': [ | 111 'conditions': [ |
| 107 ['use_opus_rtcd==1', { | 112 ['use_opus_rtcd==1', { |
| 108 'defines': [ | 113 'defines': [ |
| 109 'OPUS_ARM_MAY_HAVE_EDSP', | 114 'OPUS_ARM_MAY_HAVE_EDSP', |
| 110 'OPUS_ARM_MAY_HAVE_MEDIA', | 115 'OPUS_ARM_MAY_HAVE_MEDIA', |
| 111 'OPUS_ARM_MAY_HAVE_NEON', | 116 'OPUS_ARM_MAY_HAVE_NEON', |
| 112 'OPUS_HAVE_RTCD', | 117 'OPUS_HAVE_RTCD', |
| 113 ], | 118 ], |
| 114 'includes': [ | 119 'includes': [ |
| 115 'opus_srcs_rtcd.gypi', | 120 'opus_srcs_rtcd.gypi', |
|
tlegrand1
2014/10/11 08:23:21
Or here?
Fabrice (no longer in Chrome)
2014/10/13 15:45:12
Same, see above.
| |
| 116 ], | 121 ], |
| 117 }], | 122 }], |
| 118 ], | 123 ], |
| 119 }], | 124 }], |
| 120 ], | 125 ], |
| 121 }], | 126 }], |
| 122 ], | 127 ], |
| 123 }, # target opus | 128 }, # target opus |
| 124 { | 129 { |
| 125 'target_name': 'opus_demo', | 130 'target_name': 'opus_demo', |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 147 'sources': [ | 152 'sources': [ |
| 148 'src/src/opus_demo.c', | 153 'src/src/opus_demo.c', |
| 149 ], | 154 ], |
| 150 'include_dirs': [ | 155 'include_dirs': [ |
| 151 'src/celt', | 156 'src/celt', |
| 152 'src/silk', | 157 'src/silk', |
| 153 ], | 158 ], |
| 154 }, # target opus_demo | 159 }, # target opus_demo |
| 155 ] | 160 ] |
| 156 } | 161 } |
| OLD | NEW |