diff options
| author | ajwong <ajwong@chromium.org> | 2014-08-23 14:36:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-23 21:43:27 +0000 |
| commit | f7b1cb6926cabc20a89b2713e8c59402e6d260af (patch) | |
| tree | 146b867b781f75ed7d4522649f4c4d550321c1d1 /jingle | |
| parent | 1f4903ba455aed8cb3863dd41028759158d50c57 (diff) | |
| download | chromium_src-f7b1cb6926cabc20a89b2713e8c59402e6d260af.zip chromium_src-f7b1cb6926cabc20a89b2713e8c59402e6d260af.tar.gz chromium_src-f7b1cb6926cabc20a89b2713e8c59402e6d260af.tar.bz2 | |
Port parts of //third_pary/libjingle build to GN
Reimplements parts of //third_party/libjingle's build in GN.
The new build is much less flexible than the original. No
configuration variables have been ported. Some windows-specific configs
have been left out and annotated with TODOs. Most signifcantly, the
entirety of the 'if (enable_webrtc)' block has been omitted, because the
GN build for webrtc isn't working yet.
Despite these limitations, it is an adequate replacement for the
'stub' libjingle target in most situations.
Note, this CL is a near direct copy of rlarocque's work at
https://codereview.chromium.org/455583002/
BUG=none
TBR=sky,pavely,rlarocque
Review URL: https://codereview.chromium.org/498603002
Cr-Commit-Position: refs/heads/master@{#291587}
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/BUILD.gn | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/jingle/BUILD.gn b/jingle/BUILD.gn index f64a764..00df14c 100644 --- a/jingle/BUILD.gn +++ b/jingle/BUILD.gn @@ -17,14 +17,9 @@ if (enable_webrtc || !is_android) { "//base", "//base/third_party/dynamic_annotations", "//net", - # '../third_party/libjingle/libjingle.gyp:libjingle', # TODO(GYP) + "//third_party/libjingle", ] - # 'export_dependent_settings': [ - # '../third_party/libjingle/libjingle.gyp:libjingle', - # ], - - # TODO(GYP): Replace this with a proper dependency on libjingle. - direct_dependent_configs = [ "//content:libjingle_stub_config", ] + forward_dependent_configs_from = [ "//third_party/libjingle" ] } # A library for sending and receiving peer-issued notifications. @@ -88,13 +83,9 @@ if (enable_webrtc || !is_android) { "//third_party/expat", "//url", ":jingle_glue", - # '../third_party/libjingle/libjingle.gyp:libjingle', # TODO(GYP) + "//third_party/libjingle", ] - # 'export_dependent_settings': [ - # '../third_party/libjingle/libjingle.gyp:libjingle', - # ], - # TODO(GYP): Replace this with a proper dependency on libjingle. - direct_dependent_configs = [ "//content:libjingle_stub_config", ] + forward_dependent_configs_from = [ "//third_party/libjingle" ] } # GYP version: jingle/jingle.gyp:notifier_test_util @@ -166,13 +157,9 @@ if (enable_webrtc || !is_android) { "//net:test_support", "//testing/gmock", "//testing/gtest", - # '../third_party/libjingle/libjingle.gyp:libjingle', # TODO(GYP) + "//third_party/libjingle", ] - # 'export_dependent_settings': [ - # '../third_party/libjingle/libjingle.gyp:libjingle', - # ], - # TODO(GYP): Replace this with a proper dependency on libjingle. - direct_dependent_configs = [ "//content:libjingle_stub_config", ] + forward_dependent_configs_from = [ "//third_party/libjingle" ] } } else { # !enable_webrtc and is_android |