diff options
| -rw-r--r-- | chrome/browser/browser_resources.grd | 4 | ||||
| -rw-r--r-- | tools/grit/grit/node/base.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 6ec01e6..10d84fa 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -23,7 +23,9 @@ <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_LINUX_SPLASH_HTML" file="resources\linux-splash.html" flattenhtml="true" type="BINDATA" /> + <if expr="os == 'linux2'"> + <include name="IDR_LINUX_SPLASH_HTML" file="resources\linux-splash.html" flattenhtml="true" type="BINDATA" /> + </if> </includes> </release> </grit> diff --git a/tools/grit/grit/node/base.py b/tools/grit/grit/node/base.py index 4a11c51..76739c3 100644 --- a/tools/grit/grit/node/base.py +++ b/tools/grit/grit/node/base.py @@ -7,6 +7,7 @@ ''' import os +import sys import types from xml.sax import saxutils @@ -459,6 +460,7 @@ class Node(grit.format.interface.ItemFormatter): The expression is given a few local variables: - 'lang' is the language currently being output - 'defs' is a map of C preprocessor-style define names to their values + - 'os' is the current platform (likely 'linux2', 'win32' or 'darwin'). - 'pp_ifdef(define)' which behaves just like the C preprocessors #ifdef, i.e. it is shorthand for "define in defs" - 'pp_if(define)' which behaves just like the C preprocessor's #if, i.e. @@ -478,6 +480,7 @@ class Node(grit.format.interface.ItemFormatter): return eval(expr, {}, {'lang' : lang, 'defs' : defs, + 'os': sys.platform, 'pp_ifdef' : pp_ifdef, 'pp_if' : pp_if}) |