Aura: Build on the linux desktop, plus add USE_ASH.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 821adc9da32b4c009491ae56536b727f79300d65..eca8e363a03214ee46f4450837a90c991a225d49 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -71,11 +71,20 @@
               '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
           }],
 
-          # Ash and ChromeOS require Aura.
-          ['(use_ash==1 or chromeos==1) and chromeos_gtk==0', {
+          # Non-GTK Chromeos implies ash.
+          ['chromeos==1', {

[sadrul, 2012/03/02 03:39:24]

Should this have been 'chromeos==1 and chromeos_gtk==0'?

[Elliot Glaysher, 2012/03/02 17:32:39]

According to saintlou, that's redundant.

[Peter Mayo, 2012/03/04 16:17:56]

We need that to support merges for R18 & earlier.  He has forgotten this before.
 Please put this back unless there is some great shift in recent history.

+            'use_ash%': 1,
             'use_aura%': 1,
           }],
 
+          # For now, Windows *AND* Linux builds that |use_aura| should also
+          # imply using ash. This rule should be removed for the future when
+          # both Linux and Windows are using the aura windows without the ash
+          # interface.
+          ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', {
+            'use_ash%': 1,
+          }],
+
           # Set default value of toolkit_views based on OS.
           ['OS=="win" or chromeos==1 or chromeos_gtk==1 or use_aura==1', {
             'toolkit_views%': 1,
@@ -352,18 +361,13 @@
           'enable_flapper_hacks%': 0,
         }],
 
-        # Enable file manager extension on Chrome OS or Aura.
-        ['chromeos==1 or use_aura==1', {
+        # Enable file manager extension on Chrome OS.
+        ['chromeos==1', {
           'file_manager_extension%': 1,
         }, {
           'file_manager_extension%': 0,
         }],
 
-        # ... except on Windows even with Aura.
-        ['use_aura==1 and OS=="win"', {
-          'file_manager_extension%': 0,
-        }],
-
         ['OS=="android"', {
           'proprietary_codecs%': 1,
           'enable_webrtc%': 0,