diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-28 18:05:22 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-28 18:05:22 +0000 |
| commit | b94f8478823affb7450c926d2c5dacf2b2634449 (patch) | |
| tree | 373d10edb6207e0ec085c3a2501db595e0af25ee /BUILD.gn | |
| parent | 484a4e72450ebd4cc59dbdb3ae29ea6ff95348cd (diff) | |
| download | webrtc-b94f8478823affb7450c926d2c5dacf2b2634449.tar.gz | |
GN: Refactor base/BUILD.gn and fix dbus-glib error.
Refactor webrtc/base/BUILD.gn to not have any subtracted
source entries.
Also fix an error in webrtc/BUILD.gn that occurs when running
on Chormium trybots as a part of enabling WebRTC for GN in
https://codereview.chromium.org/321313006/
The error is that pkg-config for dbus-glib fails. Workaround
this by putting the pkg-config entry within the proper condition.
BUG=webrtc:3441
TEST=
Successful compilation of WebRTC as standalone:
gn gen out/Default --args="build_with_chromium=false" && ninja -C out/Default
gn gen out/Default --args="build_with_chromium=false is_clang=true clang_use_chrome_plugins=false" && ninja -C out/Default
I built successfully from a Chromium checkout (with
https://codereview.chromium.org/321313006/ applied) using:
gn gen out/Default && ninja -C out/Default webrtc
R=brettw@chromium.org, henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/16759004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6560 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -6,6 +6,8 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. +# TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. + import("//build/config/arm.gni") import("//build/config/crypto.gni") import("//build/config/linux/pkg_config.gni") @@ -61,8 +63,10 @@ config("common_inherited_config") { } } -pkg_config("dbus-glib") { - packages = [ "dbus-glib-1" ] +if (have_dbus_glib) { + pkg_config("dbus-glib") { + packages = [ "dbus-glib-1" ] + } } config("common_config") { |