zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision cf9457edb7..cede888c27 (416297:419407)

Browse Source 
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}
This commit is contained in:
kjellander
2016-09-20 13:23:04 -07:00
committed by Commit bot
parent 664efbd048
commit 519da00bb3
5 changed files with 114 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -6,7 +6,7 @@
vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': 'cf9457edb7c734f509dd12149acd78410c518570',
'chromium_revision': 'cede888c27275835e5aaadf5dac49379eb3ac106',
}
# NOTE: Use http rather than https; the latter can cause problems for users

3
all.gyp
View File

@ -39,7 +39,8 @@
'conditions': [
['OS=="android" and build_with_chromium==0', {
'dependencies': [
'webrtc/api/api_java.gyp:*',
# No longer supported, please refer to GN targets.
#'webrtc/api/api_java.gyp:*',
],
}],
['include_tests==1', {

4
webrtc/build/common.gypi
View File

@ -319,6 +319,10 @@
'../..',
],
}, {
'includes': [
# Rules for excluding e.g. foo_win.cc from the build on non-Windows.
'filename_rules.gypi',
],
# Include the top-level dir so the WebRTC code can use full paths.
'include_dirs': [
'../..',

105
webrtc/build/filename_rules.gypi Normal file
View File

@ -0,0 +1,105 @@
# Copyright (c) 2016 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.
# This is a copy of the deleted build/filename_includes.gypi that
# has now been dropped from Chromium.
{
'target_conditions': [
['OS!="win" or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_win(_browsertest|_unittest|_test)?\\.(h|cc)$'],
['exclude', '(^|/)win/'],
['exclude', '(^|/)win_[^/]*\\.(h|cc)$'] ],
}],
['OS!="mac" or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_(cocoa|mac|mach)(_unittest|_test)?\\.(h|cc|c|mm?)$'],
['exclude', '(^|/)(cocoa|mac|mach)/'] ],
}],
['OS!="ios" or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_ios(_unittest|_test)?\\.(h|cc|mm?)$'],
['exclude', '(^|/)ios/'] ],
}],
['(OS!="mac" and OS!="ios") or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '\\.mm?$' ] ],
}],
# Do not exclude the linux files on *BSD since most of them can be
# shared at this point.
# In case a file is not needed, it is going to be excluded later on.
# TODO(evan): the above is not correct; we shouldn't build _linux
# files on non-linux.
['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', {
'sources/': [
['exclude', '_linux(_unittest|_test)?\\.(h|cc)$'],
['exclude', '(^|/)linux/'],
],
}],
['OS!="android" or _toolset=="host" or >(nacl_untrusted_build)==1', {
'sources/': [
['exclude', '_android(_unittest|_test)?\\.(h|cc)$'],
['exclude', '(^|/)android/'],
],
}],
['OS=="win" and >(nacl_untrusted_build)==0', {
'sources/': [
['exclude', '_posix(_unittest|_test)?\\.(h|cc)$'],
['exclude', '(^|/)posix/'],
],
}],
['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
'sources/': [
['exclude', '_chromeos(_unittest|_test)?\\.(h|cc)$'],
['exclude', '(^|/)chromeos/'],
],
}],
['>(nacl_untrusted_build)==0', {
'sources/': [
['exclude', '_nacl(_unittest)?\\.(h|cc)$'],
],
}],
['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', {
'sources/': [
['exclude', '_xdg(_unittest)?\\.(h|cc)$'],
],
}],
['<(use_x11)!=1 or >(nacl_untrusted_build)==1', {
'sources/': [
['exclude', '_(x|x11)(_interactive_uitest|_unittest)?\\.(h|cc)$'],
['exclude', '(^|/)x11_[^/]*\\.(h|cc)$'],
['exclude', '(^|/)x11/'],
['exclude', '(^|/)x/'],
],
}],
['<(toolkit_views)==0 or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_views(_browsertest|_unittest)?\\.(h|cc)$'] ]
}],
['<(use_aura)==0 or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_aura(_browsertest|_unittest)?\\.(h|cc)$'],
['exclude', '(^|/)aura/'],
['exclude', '_ash(_browsertest|_unittest)?\\.(h|cc)$'],
['exclude', '(^|/)ash/'],
]
}],
['<(use_aura)==0 or <(use_x11)==0 or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_aurax11(_browsertest|_unittest)?\\.(h|cc)$'] ]
}],
['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'],
['exclude', '_ashwin\\.(h|cc)$']
]
}],
['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ]
}],
['<(use_ozone)==0 or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '_ozone(_browsertest|_unittest)?\\.(h|cc)$'] ]
}],
['<(use_pango)==0', {
'sources/': [ ['exclude', '(^|_)pango(_util|_browsertest|_unittest)?\\.(h|cc)$'], ],
}],
]
}

3
webrtc/system_wrappers/cpu_features_webrtc.gyp
View File

@ -18,7 +18,8 @@
'source/cpu_features_android.c',
],
'dependencies': [
'../../build/android/ndk.gyp:cpu_features',
# Not supported, please refer to the GN build.
#'../../build/android/ndk.gyp:cpu_features',
],
},
],