From de3c9727778c9638392c2c4fecf6f8b02e9640b9 Mon Sep 17 00:00:00 2001
From: "saintlou@chromium.org"
 <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 7 Feb 2012 16:36:06 +0000
Subject: Add flag to build old ChromeOS (pre-Aura). Thus allowing us to have a
 bot on the main waterfall.

BUG=112962
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9346007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120784 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/common.gypi | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'build')

diff --git a/build/common.gypi b/build/common.gypi
index f30ca59..847a333 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -24,6 +24,9 @@
           # Whether we're building a ChromeOS build.
           'chromeos%': 0,
 
+          # Whether we're building pre-Aura ChromeOS (using GTK).
+          'chromeos_gtk%': 0,
+
           # Whether we are using Views Toolkit
           'toolkit_views%': 0,
 
@@ -45,6 +48,7 @@
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
+        'chromeos_gtk%': '<(chromeos_gtk)',
         'use_aura%': '<(use_aura)',
         'use_ash%': '<(use_ash)',
         'use_openssl%': '<(use_openssl)',
@@ -64,21 +68,27 @@
           }],
 
           # Ash and ChromeOS require Aura.
-          ['use_ash==1 or chromeos==1', {
+          ['(use_ash==1 or chromeos==1) and chromeos_gtk==0', {
             'use_aura%': 1,
           }],
 
           # Set default value of toolkit_views based on OS.
-          ['OS=="win" or chromeos==1 or use_aura==1', {
+          ['OS=="win" or chromeos==1 or chromeos_gtk==1 or use_aura==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
+
+          # ChromeOS GTK implies ChromeOS.
+          ['chromeos_gtk==1', {
+            'chromeos%': 1,
+          }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
+      'chromeos_gtk%': '<(chromeos_gtk)',
       'host_arch%': '<(host_arch)',
       'toolkit_views%': '<(toolkit_views)',
       'use_aura%': '<(use_aura)',
@@ -416,6 +426,7 @@
     'enable_flapper_hacks%': '<(enable_flapper_hacks)',
     'enable_pepper_threading%': '<(enable_pepper_threading)',
     'chromeos%': '<(chromeos)',
+    'chromeos_gtk%': '<(chromeos_gtk)',
     'use_virtual_keyboard%': '<(use_virtual_keyboard)',
     'use_skia_on_mac%': '<(use_skia_on_mac)',
     'use_xi2_mt%':'<(use_xi2_mt)',
-- 
cgit v1.1