From 100c9d02669910bce06099b3cc1eaad60fd661dd Mon Sep 17 00:00:00 2001 From: maxmorin Date: Thu, 15 Sep 2016 01:40:35 -0700 Subject: [PATCH] Add arraysize to rtc_base_approved. Remove dependency of audio_device on rtc_base. BUG=webrtc:3806 NOTRY=True Review-Url: https://codereview.webrtc.org/2346763002 Cr-Commit-Position: refs/heads/master@{#14223} --- webrtc/base/BUILD.gn | 2 +- webrtc/base/base.gyp | 2 +- webrtc/modules/audio_device/BUILD.gn | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index 59cdf4c11f..d4c5c0b416 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -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", diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index 9fe2c6c2e0..f149eb39bd 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -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', diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn index fcd4ffd45d..3ba8d03031 100644 --- a/webrtc/modules/audio_device/BUILD.gn +++ b/webrtc/modules/audio_device/BUILD.gn @@ -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",