Fix iOS GN build and cleanup system_wrappers

Compile fixes for GN on iOS that finally gets our bots green.

Changes to system_wrappers:
* Updated to only use inclusive sources for maintainability
* Add a few missing GN headers.
* Cleanup GYP hack for atomic32_mac.cc
* Renamed changes sources to avoid problems with GYP/GN file
   suffix rules:
  - atomic32_mac.cc -> atomic32_darwin.cc
  - atomic32_posix.cc -> atomic32_non_darwin_unix.cc
See https://code.google.com/p/chromium/codesearch#chromium/src/build/config/BUILDCONFIG.gn&l=325
for details on which extensions can/cannot be used.

BUG=webrtc:5586
NOTRY=True

Review-Url: https://codereview.webrtc.org/1999723002
Cr-Commit-Position: refs/heads/master@{#12897}
This commit is contained in:
kjellander
2016-05-25 11:37:11 -07:00
committed by Commit bot
parent a4463bcd07
commit 080a1e3fa6
10 changed files with 90 additions and 50 deletions

View File

@ -10,16 +10,22 @@ import("../build/webrtc.gni")
import("//build_overrides/webrtc.gni")
if (is_ios) {
config("rtc_sdk_common_objc_config") {
include_dirs = [
"objc/Framework/Classes",
"objc/Framework/Headers",
]
}
source_set("rtc_sdk_common_objc") {
deps = [
"../base:rtc_base",
]
cflags = [ "-fobjc-arc" ]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
include_dirs = [
"objc/Framework/Classes",
"objc/Framework/Headers",
public_configs = [
"..:common_inherited_config",
":rtc_sdk_common_objc_config",
]
sources = [
"objc/Framework/Classes/NSString+StdString.h",
@ -54,14 +60,8 @@ if (is_ios) {
":rtc_sdk_common_objc",
#"../../talk/libjingle:libjingle_peerconnection",
]
cflags = [
"-fobjc-arc",
"-Wobjc-missing-property-synthesis",
]
include_dirs = [
"objc/Framework/Classes",
"objc/Framework/Headers",
]
configs += [ "//build/config/compiler:enable_arc" ]
cflags = [ "-Wobjc-missing-property-synthesis" ]
sources = [
# Add these when there's a BUILD.gn for peer connection APIs
#"objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h",