webrtc_m130/webrtc/system_wrappers/cpu_features_webrtc.gyp
kjellander 519da00bb3 Roll chromium_revision cf9457edb7..cede888c27 (416297:419407)
This is a reland of https://codereview.webrtc.org/2348133003/ which
was reverted.
This CL adds a copy of Chromium's build/filename_rules.gypi into
webrtc/build and includes it in webrtc/build/common.gypi.
This was needed since the file was dropped in crrev.com/8c0eb8ed76
The revision of filename_rules.gypi being added is:
5b20e75e68/build/filename_rules.gypi

Change log: cf9457edb7..cede888c27
Full diff: cf9457edb7..cede888c27

Changed dependencies:
* src/buildtools: adb8bf4e8f..6115afa0ea
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/bc61769e49..ed6c5d3910
* src/third_party/ffmpeg: 35740fc7b7..3c7a098821
* src/third_party/libFuzzer/src: 96e97b48e8..eb9b8b0366
* src/third_party/libvpx/source/libvpx: e66cd132f0..4282d29355
DEPS diff: cf9457edb7..cede888c27/DEPS

Clang version changed 280106:280836
Details: cf9457edb7..cede888c27/tools/clang/scripts/update.py

NOTRY=True
TBR=marpan@webrtc.org,
BUG=None

Review-Url: https://codereview.webrtc.org/2351163002
Cr-Commit-Position: refs/heads/master@{#14310}
2016-09-20 20:23:12 +00:00

43 lines
1.2 KiB
Python

# 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.
{
'includes': [ '../build/common.gypi', ],
'conditions': [
['OS=="android"', {
'targets': [
{
'target_name': 'cpu_features_android',
'type': 'static_library',
'sources': [
'source/cpu_features_android.c',
],
'dependencies': [
# Not supported, please refer to the GN build.
#'../../build/android/ndk.gyp:cpu_features',
],
},
],
}],
['OS=="linux"', {
'targets': [
{
'target_name': 'cpu_features_linux',
'type': 'static_library',
'sources': [
'source/cpu_features_linux.c',
],
'dependencies': [
'<(webrtc_root)/common.gyp:webrtc_common',
],
},
],
}],
], # conditions
}