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/ )
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}
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 5101f27..8619ac5 100755
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -235,6 +235,7 @@
violating_files = []
for f in gyp_files:
gyp_exceptions = (
+ 'audio_device.gypi',
'base_tests.gyp',
'desktop_capture.gypi',
'p2p.gyp',
@@ -260,6 +261,7 @@
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'),
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 59cdf4c..d4c5c0b 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -93,6 +93,7 @@
sources = [
"array_view.h",
+ "arraysize.h",
"atomicops.h",
"bind.h",
"bitbuffer.cc",
@@ -288,7 +289,6 @@
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 9fe2c6c..f149eb3 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 fcd4ffd..06b3129a 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -53,7 +53,6 @@
deps = [
"../..:webrtc_common",
- "../../base:rtc_base",
"../../base:rtc_base_approved",
"../../base:rtc_task_queue",
"../../common_audio",
@@ -175,6 +174,7 @@
}
if (is_ios) {
public_deps = [
+ "../../base:rtc_base",
"../../sdk:rtc_sdk_common_objc",
]
sources += [
diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi
index 725d935..61975d0 100644
--- a/webrtc/modules/audio_device/audio_device.gypi
+++ b/webrtc/modules/audio_device/audio_device.gypi
@@ -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': [
