OLD | NEW |
---|---|
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 'conditions': [ | 11 'conditions': [ |
11 ['OS=="android"', { | 12 ['OS=="android"', { |
12 'targets': [ | 13 'targets': [ |
13 { | 14 { |
14 'target_name': 'cpu_features_android', | 15 'target_name': 'cpu_features_android', |
15 'type': 'static_library', | 16 'type': 'static_library', |
16 'sources': [ | 17 'sources': [ |
17 'source/cpu_features_android.c', | 18 'source/cpu_features_android.c', |
18 ], | 19 ], |
19 'dependencies': [ | 20 'dependencies': [ |
20 '../../build/android/ndk.gyp:cpu_features', | 21 '../../build/android/ndk.gyp:cpu_features', |
21 ], | 22 ], |
22 }, | 23 }, |
23 ], | 24 ], |
24 }], | 25 }], |
26 ['OS=="linux"', { | |
27 'targets': [ | |
28 { | |
29 'target_name': 'cpu_features_linux', | |
kjellander_webrtc
2016/04/04 06:09:45
Does it make sense to add similar target in webrtc
Simon Hosie
2016/04/05 01:15:48
I would have hoped so, but I can't seem to produce
kjellander_webrtc
2016/04/05 09:27:51
I remember that in the past CPU detection was enab
| |
30 'type': 'static_library', | |
31 'sources': [ | |
32 'source/cpu_features_linux.c', | |
33 ], | |
34 'dependencies': [ | |
35 '<(webrtc_root)/common.gyp:webrtc_common', | |
36 ], | |
37 }, | |
38 ], | |
39 }], | |
25 ], # conditions | 40 ], # conditions |
26 } | 41 } |
OLD | NEW |