admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GN: Fix some build errors for iOS.

Browse Source 
With these changes, the only problem seem to be the missing jpeg
library. See https://codereview.chromium.org/1806503002/ for more details on that.

BUG=webrtc:5195, webrtc:5748
NOTRY=True

Review URL: https://codereview.webrtc.org/1869523002

Cr-Commit-Position: refs/heads/master@{#12273}
This commit is contained in:
kjellander 2016-04-07 00:13:58 -07:00 committed by Commit bot
parent 32de827cab
commit 95177d1e71
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,14 @@ config("audio_device_config") {
"include",
"dummy", # Contains dummy audio device implementations.
]
if (is_ios) {
# GN orders flags on a target before flags from configs. In order to be able
# suppress the -Wthread-safety-analysis warning, it has come from a config
# and can't be on the target directly.
# TODO(tkchin): Remove after fixing
# https://bugs.chromium.org/p/webrtc/issues/detail?id=5748
cflags = [ "-Wno-thread-safety-analysis" ]
}
}
source_set("audio_device") {
@ -148,6 +156,7 @@ source_set("audio_device") {
"ios/voice_processing_audio_unit.mm",
]
cflags += [ "-fobjc-arc" ] # CLANG_ENABLE_OBJC_ARC = YES.
libs = [
"AudioToolbox.framework",
"AVFoundation.framework",

5
webrtc/test/BUILD.gn
View File

@ -59,6 +59,7 @@ source_set("test_support") {
"testsupport/frame_reader.h",
"testsupport/frame_writer.cc",
"testsupport/frame_writer.h",
"testsupport/iosfileutils.mm",
"testsupport/mock/mock_frame_reader.h",
"testsupport/mock/mock_frame_writer.h",
"testsupport/packet_reader.cc",
@ -76,6 +77,10 @@ source_set("test_support") {
"//testing/gtest",
]
if (is_ios) {
cflags = [ "-fobjc-arc" ] # CLANG_ENABLE_OBJC_ARC = YES.
}
if (is_android) {
deps += [ "//base:base" ]
}