generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change a GYP reference to cpufeatures.gypi

Browse Source 
This will allow us to move the remaining GYP file in android_tools
to the chromium repository by removing the direct reference to it.

BUG=webrtc:4115
R=andrew@webrtc.org, kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/35849004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8140 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fdegans@chromium.org 2015-01-23 16:35:17 +00:00
parent ad3ee2c46b
commit 8919cfe9ce
3 changed files with 63 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
webrtc/system_wrappers/cpu_features_chromium.gyp Normal file
View File

@ -0,0 +1,26 @@
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
['OS=="android"', {
'targets': [
{
'target_name': 'cpu_features_android',
'type': 'static_library',
'sources': [
'source/cpu_features_android.c',
],
'includes': [
'../../../build/android/cpufeatures.gypi',
],
},
],
}],
], # conditions
}

26
webrtc/system_wrappers/cpu_features_webrtc.gyp Normal file
View File

@ -0,0 +1,26 @@
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
['OS=="android"', {
'targets': [
{
'target_name': 'cpu_features_android',
'type': 'static_library',
'sources': [
'source/cpu_features_android.c',
],
'includes': [
'../../build/android/cpufeatures.gypi',
],
},
],
}],
], # conditions
}

36
webrtc/system_wrappers/system_wrappers.gyp
View File

@ -124,7 +124,17 @@
# with condition and event functions in system_wrappers.
'WEBRTC_CLOCK_TYPE_REALTIME',
],
'dependencies': [ 'cpu_features_android', ],
'conditions': [
['build_with_chromium==1', {
'dependencies': [
'cpu_features_chromium.gyp:cpu_features_android',
],
}, {
'dependencies': [
'cpu_features_webrtc.gyp:cpu_features_android',
],
}],
],
'link_settings': {
'libraries': [
'-llog',
@ -213,29 +223,5 @@
]
},
], # targets
'conditions': [
['OS=="android"', {
'targets': [
{
'target_name': 'cpu_features_android',
'type': 'static_library',
'sources': [
'source/cpu_features_android.c',
],
'conditions': [
['android_webview_build == 1', {
'libraries': [
'cpufeatures.a'
],
}, {
'dependencies': [
'<(android_ndk_root)/android_tools_ndk.gyp:cpu_features',
],
}],
],
},
],
}],
], # conditions
}