diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 17:07:12 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 17:08:36 +0000 |
| commit | 22fe91d3732cc46b9782792384bced33ffeee480 (patch) | |
| tree | 4d6792df56f5f894166940038de1cdd11a46a124 /jingle | |
| parent | f723adfa62d5a3f0fd7773aec0dcca30006834b8 (diff) | |
| download | chromium_src-22fe91d3732cc46b9782792384bced33ffeee480.zip chromium_src-22fe91d3732cc46b9782792384bced33ffeee480.tar.gz chromium_src-22fe91d3732cc46b9782792384bced33ffeee480.tar.bz2 | |
GN: Make content_shell and webkit_unit_tests work in component build
Except for webrtc, this produces content_shell and webkit_unit_tests
binaries that link and run successfully on linux.
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/462983002
Cr-Commit-Position: refs/heads/master@{#289007}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/BUILD.gn | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jingle/BUILD.gn b/jingle/BUILD.gn index 5b8e96c..f64a764 100644 --- a/jingle/BUILD.gn +++ b/jingle/BUILD.gn @@ -4,12 +4,12 @@ import("//build/config/features.gni") -jingle_includes = exec_script("//build/gypi_to_gn.py", - [ rebase_path("jingle.gypi") ], - "scope", - [ "jingle.gypi" ]) - if (enable_webrtc || !is_android) { + jingle_includes = exec_script("//build/gypi_to_gn.py", + [ rebase_path("jingle.gypi") ], + "scope", + [ "jingle.gypi" ]) + # GYP version: jingle/jingle.gyp:jingle_glue static_library("jingle_glue") { sources = jingle_includes.jingle_glue_sources |