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

Side by Side Diff: webrtc/build/common.gypi

Issue 1181373004: Add a [rtc_]build_with_neon variable to unify conditions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove gn config and consolidate build_with_neon condition. Created 5 years, 6 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
OLDNEW
1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 # This file contains common settings for building WebRTC components. 9 # This file contains common settings for building WebRTC components.
10 10
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 # Link-Time Optimizations 114 # Link-Time Optimizations
115 # Executes code generation at link-time instead of compile-time 115 # Executes code generation at link-time instead of compile-time
116 # https://gcc.gnu.org/wiki/LinkTimeOptimization 116 # https://gcc.gnu.org/wiki/LinkTimeOptimization
117 'use_lto%': 0, 117 'use_lto%': 0,
118 118
119 # Defer ssl perference to that specified through sslconfig.h instead of 119 # Defer ssl perference to that specified through sslconfig.h instead of
120 # choosing openssl or nss directly. In practice, this can be used to 120 # choosing openssl or nss directly. In practice, this can be used to
121 # enable schannel on windows. 121 # enable schannel on windows.
122 'use_legacy_ssl_defaults%': 0, 122 'use_legacy_ssl_defaults%': 0,
123 123
124 # Determines whether NEON code will be built. It might not be selected at
kjellander_webrtc 2015/06/18 09:06:23 I assume you mean "WebRTC doesn't support selectin
Andrew MacDonald 2015/06/25 01:09:09 No, that's not what I meant :) Just removed the r
125 # run-time.
126 'build_with_neon%': 0,
127
124 'conditions': [ 128 'conditions': [
125 ['build_with_chromium==1', { 129 ['build_with_chromium==1', {
126 # Exclude pulse audio on Chromium since its prerequisites don't require 130 # Exclude pulse audio on Chromium since its prerequisites don't require
127 # pulse audio. 131 # pulse audio.
128 'include_pulse_audio%': 0, 132 'include_pulse_audio%': 0,
129 133
130 # Exclude internal ADM since Chromium uses its own IO handling. 134 # Exclude internal ADM since Chromium uses its own IO handling.
131 'include_internal_audio_device%': 0, 135 'include_internal_audio_device%': 0,
132 }, { # Settings for the standalone (not-in-Chromium) build. 136 }, { # Settings for the standalone (not-in-Chromium) build.
133 # TODO(andrew): For now, disable the Chrome plugins, which causes a 137 # TODO(andrew): For now, disable the Chrome plugins, which causes a
(...skipping 11 matching lines...) Expand all
145 'include_tests%': 1, 149 'include_tests%': 1,
146 'restrict_webrtc_logging%': 0, 150 'restrict_webrtc_logging%': 0,
147 }], 151 }],
148 ['OS=="ios"', { 152 ['OS=="ios"', {
149 'build_libjpeg%': 0, 153 'build_libjpeg%': 0,
150 'enable_protobuf%': 0, 154 'enable_protobuf%': 0,
151 }], 155 }],
152 ['target_arch=="arm" or target_arch=="arm64"', { 156 ['target_arch=="arm" or target_arch=="arm64"', {
153 'prefer_fixed_point%': 1, 157 'prefer_fixed_point%': 1,
154 }], 158 }],
159 ['(target_arch=="arm" and (arm_neon==1 or arm_neon_optional==1)) or target _arch=="arm64"', {
160 'build_with_neon%': 1,
Andrew MacDonald 2015/06/17 22:46:21 gyp wasn't picking up the variable changes in the
161 }],
155 ['OS!="ios" and (target_arch!="arm" or arm_version>=7) and target_arch!="m ips64el"', { 162 ['OS!="ios" and (target_arch!="arm" or arm_version>=7) and target_arch!="m ips64el"', {
156 'rtc_use_openmax_dl%': 1, 163 'rtc_use_openmax_dl%': 1,
157 }, { 164 }, {
158 'rtc_use_openmax_dl%': 0, 165 'rtc_use_openmax_dl%': 0,
159 }], 166 }],
160 ], # conditions 167 ], # conditions
161 }, 168 },
162 'target_defaults': { 169 'target_defaults': {
163 'conditions': [ 170 'conditions': [
164 ['restrict_webrtc_logging==1', { 171 ['restrict_webrtc_logging==1', {
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 # of a more specific macro. 438 # of a more specific macro.
432 'defines': [ 439 'defines': [
433 'WEBRTC_POSIX', 440 'WEBRTC_POSIX',
434 ], 441 ],
435 }], 442 }],
436 ], 443 ],
437 }, 444 },
438 }, # target_defaults 445 }, # target_defaults
439 } 446 }
440 447
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698