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

Unified Diff: webrtc/sdk/BUILD.gn

Issue 2393133007: Using relative path for GN for iOS. (Closed)
Patch Set: Created 4 years, 2 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 | « no previous file | no next file » | 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 f4402c8b452b3a90b516cf44c829a849589c7102..9074fa8c83d84819a0784721cc05323605e8a46b 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -253,7 +253,7 @@ if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
"objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h",
"objc/Framework/Headers/WebRTC/WebRTC.h",
]
- if (is_mac) {
+ if (is_mac && !is_ios) {
tkchin_webrtc 2016/10/07 20:07:58 why is this needed?
nicholss 2016/10/07 20:42:29 In GN, if is_ios us true, then is_mac is also true
tkchin_webrtc 2016/10/07 20:48:42 Is there a history behind that? It's odd that when
mac_framework_bundle("rtc_sdk_framework_objc") {
info_plist = "objc/Framework/Info.plist"
output_name = "WebRTC"
@@ -267,8 +267,8 @@ if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
deps = [
":rtc_sdk_peerconnection_objc",
- "//webrtc/system_wrappers:field_trial_default",
- "//webrtc/system_wrappers:metrics_default",
+ "../system_wrappers:field_trial_default",
+ "../system_wrappers:metrics_default",
]
libs = [
@@ -309,8 +309,8 @@ if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
deps = [
":rtc_sdk_peerconnection_objc",
- "//webrtc/system_wrappers:field_trial_default",
- "//webrtc/system_wrappers:metrics_default",
+ "../system_wrappers:field_trial_default",
+ "../system_wrappers:metrics_default",
]
libs = [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698