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

Reland of Add arraysize to rtc_base_approved. Remove dependency of audio_device on rtc_base. (patchset #1 id:1 of https://codereview.webrtc.org/2340253003/ )

Browse Source 
Reason for revert:
Fix: let audio_device depend on rtc_base on IOS.

Original issue's description:
> Revert of Add arraysize to rtc_base_approved. Remove dependency of audio_device on rtc_base. (patchset #1 id:1 of https://codereview.webrtc.org/2346763002/ )
>
> Reason for revert:
> Breaks iOS
>
> Original issue's description:
> > Add arraysize to rtc_base_approved. Remove dependency of audio_device on rtc_base.
> >
> > BUG=webrtc:3806
> > NOTRY=True
> >
> > Committed: https://crrev.com/100c9d02669910bce06099b3cc1eaad60fd661dd
> > Cr-Commit-Position: refs/heads/master@{#14223}
>
> TBR=kjellander@webrtc.org,henrika@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:3806
>
> Committed: https://crrev.com/89fb9201b70616a1c33e277f38bf9367112536e8
> Cr-Commit-Position: refs/heads/master@{#14224}

TBR=kjellander@webrtc.org,henrika@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOTRY=true
BUG=webrtc:3806

Review-Url: https://codereview.webrtc.org/2340233003
Cr-Commit-Position: refs/heads/master@{#14233}
This commit is contained in:
maxmorin
2016-09-15 05:11:55 -07:00
committed by Commit bot
parent 0a6e0dc471
commit ec62374ccd
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PRESUBMIT.py
View File

@ -235,6 +235,7 @@ def _CheckNoRtcBaseDeps(input_api, gyp_files, output_api):
violating_files = []
for f in gyp_files:
gyp_exceptions = (
'audio_device.gypi',
'base_tests.gyp',
'desktop_capture.gypi',
'p2p.gyp',
@ -260,6 +261,7 @@ def _CheckNoRtcBaseDepsGn(input_api, gn_files, output_api):
violating_files = []
for f in gn_files:
gn_exceptions = (
os.path.join('audio_device', 'BUILD.gn'),
os.path.join('base_tests', 'BUILD.gn'),
os.path.join('desktop_capture', 'BUILD.gn'),
os.path.join('p2p', 'BUILD.gn'),

2
webrtc/base/BUILD.gn
View File

@ -93,6 +93,7 @@ rtc_static_library("rtc_base_approved") {
sources = [
"array_view.h",
"arraysize.h",
"atomicops.h",
"bind.h",
"bitbuffer.cc",
@ -288,7 +289,6 @@ rtc_static_library("rtc_base") {
sources = [
"applefilesystem.mm",
"arraysize.h",
"asyncfile.cc",
"asyncfile.h",
"asyncinvoker-inl.h",

2
webrtc/base/base.gyp
View File

@ -29,6 +29,7 @@
'target_name': 'rtc_base_approved',
'type': 'static_library',
'sources': [
'arraysize.h',
'array_view.h',
'atomicops.h',
'bind.h',
@ -231,7 +232,6 @@
],
'sources': [
'applefilesystem.mm',
'arraysize.h',
'asyncfile.cc',
'asyncfile.h',
'asyncinvoker.cc',

2
webrtc/modules/audio_device/BUILD.gn
View File

@ -53,7 +53,6 @@ rtc_source_set("audio_device") {
deps = [
"../..:webrtc_common",
"../../base:rtc_base",
"../../base:rtc_base_approved",
"../../base:rtc_task_queue",
"../../common_audio",
@ -175,6 +174,7 @@ rtc_source_set("audio_device") {
}
if (is_ios) {
public_deps = [
"../../base:rtc_base",
"../../sdk:rtc_sdk_common_objc",
]
sources += [

1
webrtc/modules/audio_device/audio_device.gypi
View File

@ -173,6 +173,7 @@
}],
['OS=="ios"', {
'dependencies': [
'<(webrtc_root)/base/base.gyp:rtc_base',
'<(webrtc_root)/sdk/sdk.gyp:rtc_sdk_common_objc',
],
'export_dependent_settings': [