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

Side by Side Diff: webrtc/system_wrappers/cpu_features_webrtc.gyp

Issue 2348133003: Roll chromium_revision cf9457edb7..cede888c27 (416297:419407) (Closed)
Patch Set: Remove tabs Created 4 years, 3 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 | « all.gyp ('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) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 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 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
11 'conditions': [ 11 'conditions': [
12 ['OS=="android"', { 12 ['OS=="android"', {
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'cpu_features_android', 15 'target_name': 'cpu_features_android',
16 'type': 'static_library', 16 'type': 'static_library',
17 'sources': [ 17 'sources': [
18 'source/cpu_features_android.c', 18 'source/cpu_features_android.c',
19 ], 19 ],
20 'dependencies': [ 20 'dependencies': [
21 '../../build/android/ndk.gyp:cpu_features', 21 # Not supported, please refer to the GN build.
22 #'../../build/android/ndk.gyp:cpu_features',
22 ], 23 ],
23 }, 24 },
24 ], 25 ],
25 }], 26 }],
26 ['OS=="linux"', { 27 ['OS=="linux"', {
27 'targets': [ 28 'targets': [
28 { 29 {
29 'target_name': 'cpu_features_linux', 30 'target_name': 'cpu_features_linux',
30 'type': 'static_library', 31 'type': 'static_library',
31 'sources': [ 32 'sources': [
32 'source/cpu_features_linux.c', 33 'source/cpu_features_linux.c',
33 ], 34 ],
34 'dependencies': [ 35 'dependencies': [
35 '<(webrtc_root)/common.gyp:webrtc_common', 36 '<(webrtc_root)/common.gyp:webrtc_common',
36 ], 37 ],
37 }, 38 },
38 ], 39 ],
39 }], 40 }],
40 ], # conditions 41 ], # conditions
41 } 42 }
OLDNEW
« no previous file with comments | « all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698