summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorapacible <apacible@chromium.org>2015-04-23 11:57:13 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 18:57:16 +0000
commit2be1ebd65b769821ad36e6cff2d47bda574c00bb (patch)
tree69dc4e70538b26d9d92daa7ad8f05fcb757c7573 /build
parent29777a8ee0f45b8160ec004e74013d5b62b6828a (diff)
downloadchromium_src-2be1ebd65b769821ad36e6cff2d47bda574c00bb.zip
chromium_src-2be1ebd65b769821ad36e6cff2d47bda574c00bb.tar.gz
chromium_src-2be1ebd65b769821ad36e6cff2d47bda574c00bb.tar.bz2
Add enable_media_router check to GN based grit targets.
Originally, <if expr="enable_media_router"> was not picked up by a .grd file. I traced that to grit_rule.gni and added a check there. Review URL: https://codereview.chromium.org/1104443002 Cr-Commit-Position: refs/heads/master@{#326598}
Diffstat (limited to 'build')
-rw-r--r--build/secondary/tools/grit/grit_rule.gni6
1 files changed, 6 insertions, 0 deletions
diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni
index 64cfd77..09a04c1 100644
--- a/build/secondary/tools/grit/grit_rule.gni
+++ b/build/secondary/tools/grit/grit_rule.gni
@@ -204,6 +204,12 @@ if (enable_extensions) {
"enable_extensions",
]
}
+if (enable_media_router) {
+ grit_defines += [
+ "-D",
+ "enable_media_router",
+ ]
+}
if (enable_plugins) {
grit_defines += [
"-D",