Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(526)

Unified Diff: webrtc/sdk/BUILD.gn

Issue 1999723002: Fix iOS GN build and cleanup system_wrappers (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Renamed to atomic32_non_darwin_unix.cc due to _android suffix filtering Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/video_coding/BUILD.gn ('k') | webrtc/system_wrappers/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/BUILD.gn
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index 91a4c8828ed3eb7bceb850d22f5052afd45e89bf..fbca40d2da28474331ac2bd3e6019cd7373dcc07 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -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
tkchin_webrtc 2016/05/25 17:46:21 Is there a plan to get GN working for peerconnecti
kjellander_webrtc 2016/05/25 17:54:02 That would be my next thing to look at. Getting th
#"objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h",
« no previous file with comments | « webrtc/modules/video_coding/BUILD.gn ('k') | webrtc/system_wrappers/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698