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

Side by Side Diff: third_party/opus/opus.gyp

Issue 636083002: Remove obsoleted target_arch==armv7 from opus.gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use OS=="linux". Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « third_party/opus/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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=="arm64"', {
9 'use_opus_fixed_point%': 1, 9 'use_opus_fixed_point%': 1,
10 }, { 10 }, {
11 'use_opus_fixed_point%': 0, 11 'use_opus_fixed_point%': 0,
12 }], 12 }],
13 ['target_arch=="arm" or target_arch=="armv7"', { 13 ['target_arch=="arm"', {
14 'use_opus_arm_optimization%': 1, 14 'use_opus_arm_optimization%': 1,
15 }, { 15 }, {
16 'use_opus_arm_optimization%': 0, 16 'use_opus_arm_optimization%': 0,
17 }], 17 }],
18 ['target_arch=="arm"', { 18 ['target_arch=="arm" and (OS=="win" or OS=="android" or OS=="linux")', {
19 # Based on the conditions in celt/arm/armcpu.c:
20 # defined(_MSC_VER) || defined(__linux__).
19 'use_opus_rtcd%': 1, 21 'use_opus_rtcd%': 1,
20 }, { 22 }, {
21 'use_opus_rtcd%': 0, 23 'use_opus_rtcd%': 0,
22 }], 24 }],
23 ], 25 ],
24 }, 26 },
25 'targets': [ 27 'targets': [
26 { 28 {
27 'target_name': 'opus', 29 'target_name': 'opus',
28 'type': 'static_library', 30 'type': 'static_library',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 # optimizations are turned off. 76 # optimizations are turned off.
75 'cflags': [ 77 'cflags': [
76 '-Wno-#pragma-messages', 78 '-Wno-#pragma-messages',
77 ], 79 ],
78 'xcode_settings': { 80 'xcode_settings': {
79 'WARNING_CFLAGS': [ 81 'WARNING_CFLAGS': [
80 '-Wno-#pragma-messages', 82 '-Wno-#pragma-messages',
81 ], 83 ],
82 }, 84 },
83 }], 85 }],
84 ['os_posix==1 and (target_arch=="arm" or target_arch=="armv7" or target_ arch=="arm64")', { 86 ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', {
85 'cflags!': ['-Os'], 87 'cflags!': ['-Os'],
86 'cflags': ['-O3'], 88 'cflags': ['-O3'],
87 }], 89 }],
88 ['use_opus_fixed_point==0', { 90 ['use_opus_fixed_point==0', {
89 'include_dirs': [ 91 'include_dirs': [
90 'src/silk/float', 92 'src/silk/float',
91 ], 93 ],
92 'sources': ['<@(opus_float_sources)'], 94 'sources': ['<@(opus_float_sources)'],
93 }, { 95 }, {
94 'defines': [ 96 'defines': [
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 'sources': [ 154 'sources': [
153 'src/src/opus_demo.c', 155 'src/src/opus_demo.c',
154 ], 156 ],
155 'include_dirs': [ 157 'include_dirs': [
156 'src/celt', 158 'src/celt',
157 'src/silk', 159 'src/silk',
158 ], 160 ],
159 }, # target opus_demo 161 }, # target opus_demo
160 ] 162 ]
161 } 163 }
OLDNEW
« no previous file with comments | « third_party/opus/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698