From b96fc5dc177d311db220dc4039e74a9c0d871558 Mon Sep 17 00:00:00 2001
From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 18 Dec 2008 23:26:29 +0000
Subject: Convert from using env['PLATFORM'] directly to using the more
 flexible and better-thought-out Hammer env.Bits() idioms: * env['PLATFORM']
 == 'win32' => env.Bit('windows') * env['PLATFORM'] == 'posix' =>
 env.Bit('linux') * env['PLATFORM'] == 'darwin' => env.Bit('mac') New idioms:
 * env.Bit('posix') => really does mean "any POSIX platform" *
 env.AnyBits('mac', 'linux') => specifically mac or linux, excluding   other
 POSIX platforms Where we were using compound conditionals (e.g.,
 "env['PLATFORM'] in ('posix', 'darwin')") I tried to take my best shot at
 translating the intent (i.e., "env.Bits('posix')" for something POSIX, "not
 env.Bits('mac')" for something not yet ported to Mac, etc.) Review URL:
 http://codereview.chromium.org/15051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7270 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/common/common.scons | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'chrome/common/common.scons')

diff --git a/chrome/common/common.scons b/chrome/common/common.scons
index 371d2df4..5b82155 100644
--- a/chrome/common/common.scons
+++ b/chrome/common/common.scons
@@ -32,7 +32,7 @@ env.Append(
     ],
 )
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env.Prepend(
       CPPPATH = [
           '$CHROME_DIR/tools/build/win',
@@ -41,7 +41,7 @@ if env['PLATFORM'] == 'win32':
 
 input_files = []
 
-if env['PLATFORM'] in ('posix', 'win32'):
+if not env.Bit('mac'):
   # TODO(port): Port to Mac.
   input_files.extend([
       'animation.cc',
@@ -77,7 +77,7 @@ if env['PLATFORM'] in ('posix', 'win32'):
       'visitedlink_common.cc',
   ])
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   # TODO(port): Port these.
   input_files.extend([
       'child_process.cc',
@@ -111,24 +111,24 @@ if env['PLATFORM'] == 'win32':
       'worker_thread_ticker.cc',
   ])
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   # Windows specific files
   input_files.extend([
       'gfx/chrome_font_win.cc',
       'ipc_channel_win.cc',
   ])
-elif env['PLATFORM'] == 'posix':
+elif env.Bit('linux'):
   input_files.extend([
       'gfx/chrome_canvas_skia.cc',
       'gfx/chrome_font_skia.cc',
   ])
 
-if env['PLATFORM'] in ['posix', 'mac']:
+if env.Bit('posix'):
   input_files.extend([
       'ipc_channel_posix.cc',
   ])
 
 
-if env['PLATFORM'] in ('posix', 'win32'):
+if not env.Bit('mac'):
   # TODO(port): This should be enabled for all platforms.
   env.ChromeStaticLibrary('common', input_files)
-- 
cgit v1.1