Upstream Android-specific strings.

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
   'variables': {
     # Putting a variables dict inside another variables dict looks kind of
     # weird.  This is done so that 'host_arch', 'chromeos', etc are defined as
     # variables within the outer variables dict here.  This is necessary
     # to get these variables defined for the conditions within this variables
     # dict that operate on these variables.
     'variables': {
       'variables': {
         'variables': {
-          # Whether we're building a ChromeOS build.
-          'chromeos%': 0,
+          'variables': {
+            # Whether we're building a ChromeOS build.
+            'chromeos%': 0,
+
+            # Whether or not we are using the Aura windowing framework.
+            'use_aura%': 0,
+
+            # Whether or not we are building the Ash shell.
+            'use_ash%': 0,
+          },
+          # Copy conditionally-set variables out one scope.
+          'chromeos%': '<(chromeos)',
+          'use_aura%': '<(use_aura)',
+          'use_ash%': '<(use_ash)',
 
           # Whether we are using Views Toolkit
           'toolkit_views%': 0,
 
-          # Whether or not we are using the Aura windowing framework.
-          'use_aura%': 0,
-
-          # Whether or not we are building the Ash shell.
-          'use_ash%': 0,
-
           # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803
           'use_openssl%': 0,
 
           'use_ibus%': 0,
 
           # Disable viewport meta tag by default.
           'enable_viewport%': 0,
 
           # Enable HiDPI support.
           'enable_hidpi%': 0,
 
           # Enable touch optimized art assets and metrics.
           'enable_touch_ui%': 0,
 
           # Is this change part of the android upstream bringup?
           # Allows us to *temporarily* disable certain things for
           # staging.  Only set to 1 in a GYP_DEFINES.
           'android_upstream_bringup%': 0,
 
           # Override buildtype to select the desired build flavor.
           # Dev - everyday build for development/testing
           # Official - release build (generally implies additional processing)
           # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
           # conversion is done), some of the things which are now controlled by
           # 'branding', such as symbol generation, will need to be refactored
           # based on 'buildtype' (i.e. we don't care about saving symbols for
           # non-Official # builds).
           'buildtype%': 'Dev',
+
+          'conditions': [
+            # ChromeOS implies ash.
+            ['chromeos==1', {
+              'use_ash%': 1,
+              'use_aura%': 1,
+            }],
+
+            # For now, Windows *AND* Linux builds that |use_aura| should also

[sky, 2012/08/06 20:41:52]

Don't you mean windows only here?

[newt (away), 2012/08/06 21:13:16]

I guess so (though I don't know much about aura and ash).  That comment used to
make sense, then https://chromiumcodereview.appspot.com/10389217 changed things.
 Is it true that linux builds now use aura without ash?

[newt (away), 2012/08/06 21:57:53]

Done.

+            # 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=="win"', {
+              'use_ash%': 1,
+            }],
+            ['use_ash==1', {
+              'use_aura%': 1,
+            }],
+          ],
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
         'use_aura%': '<(use_aura)',
         'use_ash%': '<(use_ash)',
         'use_openssl%': '<(use_openssl)',
         'use_ibus%': '<(use_ibus)',
         'enable_viewport%': '<(enable_viewport)',
         'enable_hidpi%': '<(enable_hidpi)',
         'enable_touch_ui%': '<(enable_touch_ui)',
@@ skipping 10 matching lines @@
           ['OS=="win" or OS=="mac" or OS=="ios"', {
             'host_arch%': 'ia32',
           }, {
             # This handles the Unix platforms for which there is some support.
             # Anything else gets passed through, which probably won't work very
             # well; such hosts should pass an explicit target_arch to gyp.
             'host_arch%':
               '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
           }],
 
-          # Chromeos implies ash.
-          ['chromeos==1', {
-            '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=="win"', {
-            'use_ash%': 1,
-          }],
-          ['use_ash==1', {
-            'use_aura%': 1,
-          }],
-
           # Set default value of toolkit_views based on OS.
           ['OS=="win" or chromeos==1 or use_aura==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
 
+          # Set toolkit_uses_gtk for the Chromium browser on Linux.
+          ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
+            'toolkit_uses_gtk%': 1,
+          }, {
+            'toolkit_uses_gtk%': 0,
+          }],
+
           # Enable HiDPI on Mac OS.
           ['OS=="mac"', {
             'enable_hidpi%': 1,
           }],
 
           # Enable touch UI on Metro and Chrome OS.
           ['OS=="win" or chromeos==1', {
             'enable_touch_ui%': 1,
           }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
       'host_arch%': '<(host_arch)',
       'toolkit_views%': '<(toolkit_views)',
+      'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
       'use_aura%': '<(use_aura)',
       'use_ash%': '<(use_ash)',
       'use_openssl%': '<(use_openssl)',
       'use_ibus%': '<(use_ibus)',
       'enable_viewport%': '<(enable_viewport)',
       'enable_hidpi%': '<(enable_hidpi)',
       'enable_touch_ui%': '<(enable_touch_ui)',
       'android_upstream_bringup%': '<(android_upstream_bringup)',
       'android_build_type%': '<(android_build_type)',
 
@@ skipping 265 matching lines @@
 
         # Flags to use X11 on non-Mac POSIX platforms
         ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
           'use_glib%': 0,
           'use_x11%': 0,
         }, {
           'use_glib%': 1,
           'use_x11%': 1,
         }],
 
-        # Set toolkit_uses_gtk for the Chromium browser on Linux.
-        ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
-          'toolkit_uses_gtk%': 1,
-        }, {
-          'toolkit_uses_gtk%': 0,
-        }],
-
         # We always use skia text rendering in Aura on Windows, since GDI
         # doesn't agree with our BackingStore.
         # TODO(beng): remove once skia text rendering is on by default.
         ['use_aura==1 and OS=="win"', {
           'enable_skia_text%': 1,
         }],
 
         # A flag to enable or disable our compile-time dependency
         # on gnome-keyring. If that dependency is disabled, no gnome-keyring
         # support will be available. This option is useful
         # for Linux distributions and for Aura.
         ['chromeos==1 or use_aura==1', {
           'use_gnome_keyring%': 0,
         }, {
           'use_gnome_keyring%': 1,
         }],
 
-        ['toolkit_views==0 or OS=="mac" or OS=="ios"', {
+        ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', {
           # GTK+, Mac and iOS want Title Case strings
           'use_titlecase_in_grd_files%': 1,
         }],
 
         # Enable file manager extension on Chrome OS.
         ['chromeos==1', {
           'file_manager_extension%': 1,
         }, {
           'file_manager_extension%': 0,
         }],
@@ skipping 2891 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }