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

GN: Fix dependency for rtc_base_approved

Browse Source 
In https://codereview.webrtc.org/1921463002/ a dependency
on Foundation.framework was added to rtc_base_approved for the
GYP build but not for the GN build. This was fixed for some
targets in https://codereview.webrtc.org/1919673002/ but the proper
fix is to introduce an all_dependent_configs entry for rtc_base_approved.

NOTRY=True

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

Cr-Commit-Position: refs/heads/master@{#12483}
This commit is contained in:
kjellander 2016-04-24 23:03:07 -07:00 committed by Commit bot
parent c23bf2e54d
commit 84ba8b6f45
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/base/BUILD.gn
View File

@ -12,6 +12,12 @@ import("../build/webrtc.gni")
import("//build_overrides/webrtc.gni")
config("rtc_base_approved_all_dependent_config") {
if (is_mac && !build_with_chromium) {
libs = [ "Foundation.framework" ] # needed for logging_mac.mm
}
}
config("rtc_base_config") {
include_dirs = [
"//third_party/jsoncpp/overrides/include",
@ -94,6 +100,7 @@ static_library("rtc_base_approved") {
deps = []
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ]
sources = [
"array_view.h",

9
webrtc/tools/BUILD.gn
View File

@ -47,9 +47,6 @@ executable("frame_analyzer") {
":command_line_parser",
":video_quality_analysis",
]
if (is_mac) {
libs = [ "Foundation.framework" ]
}
}
executable("rgba_to_i420_converter") {
@ -62,9 +59,6 @@ executable("rgba_to_i420_converter") {
":command_line_parser",
"../common_video",
]
if (is_mac) {
libs = [ "Foundation.framework" ]
}
}
# TODO(kjellander): Convert all of tools.gyp into GN here.
@ -85,8 +79,5 @@ if (!build_with_chromium) {
"../test:test_support_main",
"//testing/gtest",
]
if (is_mac) {
libs = [ "Foundation.framework" ]
}
}
}