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}
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index 91a4c88..fbca40d 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -10,16 +10,22 @@
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 @@
":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",
