summaryrefslogtreecommitdiffstats
path: root/blimp
diff options
context:
space:
mode:
authorkmarshall <kmarshall@chromium.org>2015-11-06 15:22:25 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-06 23:23:13 +0000
commit4b0a4ee8664a68010b76df31af136ead36917199 (patch)
tree28053c9e922a8225f625edd435c6f9f2f23e3032 /blimp
parentcd2dd0a028b2f2efe3f1053eb34091e30e0d1548 (diff)
downloadchromium_src-4b0a4ee8664a68010b76df31af136ead36917199.zip
chromium_src-4b0a4ee8664a68010b76df31af136ead36917199.tar.gz
chromium_src-4b0a4ee8664a68010b76df31af136ead36917199.tar.bz2
Add a missing blimp_common build dep to content/content_switches.cc.
The Blimp engine app wouldn't link due to missing symbol errors. R=dtrainor@chromium.org,nyquist@chromium.org BUG= Review URL: https://codereview.chromium.org/1431083002 Cr-Commit-Position: refs/heads/master@{#358443}
Diffstat (limited to 'blimp')
-rw-r--r--blimp/common/BUILD.gn14
1 files changed, 5 insertions, 9 deletions
diff --git a/blimp/common/BUILD.gn b/blimp/common/BUILD.gn
index 4c3e275..07bc2fa 100644
--- a/blimp/common/BUILD.gn
+++ b/blimp/common/BUILD.gn
@@ -11,16 +11,12 @@ component("blimp_common") {
"compositor/blimp_layer_tree_settings.h",
"compositor/blimp_task_graph_runner.cc",
"compositor/blimp_task_graph_runner.h",
- ]
- if (is_android) {
- sources += [
- # TODO(dtrainor): Remove this once the LayerTreeHost settings for Blimp
- # are finalized or are pushed from the server component. See
- # crbug.com/527655.
- "../../content/public/common/content_switches.cc",
- ]
- }
+ # TODO(dtrainor): Remove this once the LayerTreeHost settings for Blimp
+ # are finalized or are pushed from the server component. See
+ # crbug.com/527655.
+ "../../content/public/common/content_switches.cc",
+ ]
defines = [ "BLIMP_COMMON_IMPLEMENTATION=1" ]