diff options
| author | Brett Wilson <brettw@chromium.org> | 2014-12-01 14:21:19 -0800 |
|---|---|---|
| committer | Brett Wilson <brettw@chromium.org> | 2014-12-01 22:22:54 +0000 |
| commit | 2954bd38c7dfd9e5c36fae26ccaafb9088605bf8 (patch) | |
| tree | 667b7e94f44feab1963ed13112bc2de31d26ecd1 /build/secondary/tools | |
| parent | 387356b291bfb0e278bb350e0d1e492107a292e4 (diff) | |
| download | chromium_src-2954bd38c7dfd9e5c36fae26ccaafb9088605bf8.zip chromium_src-2954bd38c7dfd9e5c36fae26ccaafb9088605bf8.tar.gz chromium_src-2954bd38c7dfd9e5c36fae26ccaafb9088605bf8.tar.bz2 | |
Add enable_hangout_services_extension flag to GN build.
This does not yet control anything, but is now hooked up to the C++ and grit defines as in GYP.
R=bemasc@chromium.org
Review URL: https://codereview.chromium.org/751613006
Cr-Commit-Position: refs/heads/master@{#306270}
Diffstat (limited to 'build/secondary/tools')
| -rw-r--r-- | build/secondary/tools/grit/grit_rule.gni | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni index 8726927..d49c4ed 100644 --- a/build/secondary/tools/grit/grit_rule.gni +++ b/build/secondary/tools/grit/grit_rule.gni @@ -182,8 +182,9 @@ if (enable_google_now) { if (enable_webrtc) { grit_defines += [ "-D", "enable_webrtc" ] } -# Note: enable_hangout_services_extension is omitted. It is never set in the -# GYP build. Need to figure out what it's for. +if (enable_hangout_services_extension) { + grit_defines += [ "-D", "enable_hangout_services_extension" ] +} if (enable_task_manager) { grit_defines += [ "-D", "enable_task_manager" ] } |