diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 15:29:17 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 15:29:17 +0000 |
| commit | 77e59c5903f185221f4913567463bd9f8fa433ba (patch) | |
| tree | 6721d9ac562df8b9322e483fa18112590f2a3e96 /content/content_resources.grd | |
| parent | 4129e3387530954a86a5153b6e690e4065d32f5e (diff) | |
| download | chromium_src-77e59c5903f185221f4913567463bd9f8fa433ba.zip chromium_src-77e59c5903f185221f4913567463bd9f8fa433ba.tar.gz chromium_src-77e59c5903f185221f4913567463bd9f8fa433ba.tar.bz2 | |
Android: use grit target platform instead of define.
grit now supports passing "-t android" to set the target platform to
android, which sets is_android and is_posix, and does *not* set
is_linux (matching the OS_* macros). Use this instead of defining an
"android" macro.
This requires one actual condition change in app_locale_settings as
the Android port was previously depending on is_linux being true for
its definitions of IDS_WEB_FONT_*. The other grd changes are all
trivial substitutions.
BUG=239434
TBR=jamesr@chromium.org, joi@chromium.org, newt@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/14834011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_resources.grd')
| -rw-r--r-- | content/content_resources.grd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/content_resources.grd b/content/content_resources.grd index fa32cb4..bdff27e 100644 --- a/content/content_resources.grd +++ b/content/content_resources.grd @@ -31,7 +31,7 @@ <include name="IDR_RENDERER_SANDBOX_PROFILE" file="renderer/renderer.sb" type="BINDATA" /> <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" type="BINDATA" /> </if> - <if expr="not pp_ifdef('android')"> + <if expr="not is_android"> <include name="IDR_TRACING_HTML" file="../third_party/trace-viewer/src/about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_TRACING_JS" file="../third_party/trace-viewer/src/about_tracing.js" flattenhtml="true" type="BINDATA" /> </if> |