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

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: Add missing cflags change to gn. Created 6 years, 2 months 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"', {
minyue 2014/10/09 07:49:53 Has armv7 become arm in the building system? If s
ajm 2014/10/09 15:29:32 Yes, you now specify armv7 with target_arch=="arm"
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 desktop_linux==1 o r chromeos==1)', {
minyue 2014/10/09 15:38:10 With deprecation of armv7, did iOS already end up
ajm 2014/10/09 15:42:41 In our standalone webrtc waterfall, we're still (i
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 # optimizations are turned off. 71 # optimizations are turned off.
70 'cflags': [ 72 'cflags': [
71 '-Wno-#pragma-messages', 73 '-Wno-#pragma-messages',
72 ], 74 ],
73 'xcode_settings': { 75 'xcode_settings': {
74 'WARNING_CFLAGS': [ 76 'WARNING_CFLAGS': [
75 '-Wno-#pragma-messages', 77 '-Wno-#pragma-messages',
76 ], 78 ],
77 }, 79 },
78 }], 80 }],
79 ['os_posix==1 and (target_arch=="arm" or target_arch=="armv7" or target_ arch=="arm64")', { 81 ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', {
80 'cflags!': ['-Os'], 82 'cflags!': ['-Os'],
81 'cflags': ['-O3'], 83 'cflags': ['-O3'],
82 }], 84 }],
83 ['use_opus_fixed_point==0', { 85 ['use_opus_fixed_point==0', {
84 'include_dirs': [ 86 'include_dirs': [
85 'src/silk/float', 87 'src/silk/float',
86 ], 88 ],
87 'sources': ['<@(opus_float_sources)'], 89 'sources': ['<@(opus_float_sources)'],
88 }, { 90 }, {
89 'defines': [ 91 'defines': [
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 'sources': [ 149 'sources': [
148 'src/src/opus_demo.c', 150 'src/src/opus_demo.c',
149 ], 151 ],
150 'include_dirs': [ 152 'include_dirs': [
151 'src/celt', 153 'src/celt',
152 'src/silk', 154 'src/silk',
153 ], 155 ],
154 }, # target opus_demo 156 }, # target opus_demo
155 ] 157 ]
156 } 158 }
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