From 89fb9201b70616a1c33e277f38bf9367112536e8 Mon Sep 17 00:00:00 2001
From: maxmorin <maxmorin@webrtc.org>
Date: Thu, 15 Sep 2016 01:45:25 -0700
Subject: [PATCH] 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

Review-Url: https://codereview.webrtc.org/2340253003
Cr-Commit-Position: refs/heads/master@{#14224}
---
 webrtc/base/BUILD.gn                 | 2 +-
 webrtc/base/base.gyp                 | 2 +-
 webrtc/modules/audio_device/BUILD.gn | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index d4c5c0b416..59cdf4c11f 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -93,7 +93,6 @@ rtc_static_library("rtc_base_approved") {
 
   sources = [
     "array_view.h",
-    "arraysize.h",
     "atomicops.h",
     "bind.h",
     "bitbuffer.cc",
@@ -289,6 +288,7 @@ 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 f149eb39bd..9fe2c6c2e0 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -29,7 +29,6 @@
       'target_name': 'rtc_base_approved',
       'type': 'static_library',
       'sources': [
-        'arraysize.h',
         'array_view.h',
         'atomicops.h',
         'bind.h',
@@ -232,6 +231,7 @@
       ],
       '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 3ba8d03031..fcd4ffd45d 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -53,6 +53,7 @@ rtc_source_set("audio_device") {
 
   deps = [
     "../..:webrtc_common",
+    "../../base:rtc_base",
     "../../base:rtc_base_approved",
     "../../base:rtc_task_queue",
     "../../common_audio",