Reland 102005 and 102009: aura: Explicitly disable GTK.

Explicitly disable GTK by setting TOOLKIT_USES_GTK. This is the first in a
series of changes required to have chrome on aura build and link without GTK.
This CL makes base/ build without GTK. Subsequent CLs will do this for other
components.

TBR=evan@chromium.org
BUG=97131
TEST=none

Review URL: http://codereview.chromium.org/7983022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102058 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 48 insertions, 20 deletions

diff --git a/build/build_config.h b/build/build_config.h
index 5c09d45..0a42a47 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -45,7 +45,7 @@
 
 // A flag derived from the above flags, used to cover GTK code in
 // both TOOLKIT_GTK and TOOLKIT_VIEWS.
-#if defined(TOOLKIT_GTK) || (defined(TOOLKIT_VIEWS) && !defined(OS_WIN))
+#if defined(TOOLKIT_GTK) || (defined(TOOLKIT_VIEWS) && !defined(OS_WIN) && !defined(USE_AURA))
 #define TOOLKIT_USES_GTK 1
 #endif
 
diff --git a/build/common.gypi b/build/common.gypi
index d2666c4..33763c1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -235,18 +235,21 @@
           'os_posix%': 1,
         }],
 
-        # Flag to use X11 on non-Mac POSIX platforms
+        # Flags to use X11 on non-Mac POSIX platforms
         ['OS=="win" or OS=="mac" or OS=="android"', {
+          'use_glib%': 0,
+          'toolkit_uses_gtk%': 0,
           'use_x11%': 0,
         }, {
+          # TODO(dnicoara) Wayland build should have these disabled, but
+          # currently GTK and X is too spread and it's hard to completely
+          # remove every dependency.
+          'use_glib%': 1,
+          'toolkit_uses_gtk%': 1,
           'use_x11%': 1,
         }],
-
-        # Flag to use Gtk on non-Aura and non-Mac POSIX platforms
-        ['OS=="win" or OS=="mac" or OS=="android" or use_aura==1', {
+        ['use_aura==1 and OS!="win"', {
           'toolkit_uses_gtk%': 0,
-        }, {
-          'toolkit_uses_gtk%': 1,
         }],
 
         # A flag to enable or disable our compile-time dependency
@@ -310,6 +313,7 @@
     'views_compositor%': '<(views_compositor)',
     'use_aura%': '<(use_aura)',
     'os_posix%': '<(os_posix)',
+    'use_glib%': '<(use_glib)',
     'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
     'use_skia%': '<(use_skia)',
     'use_x11%': '<(use_x11)',
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 7578552..688903f 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -468,19 +468,43 @@
     {
       'target_name': 'glib',
       'type': 'settings',
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(<(pkg-config) --cflags glib-2.0)',
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)',
-        ],
-        'libraries': [
-          '<!@(<(pkg-config) --libs-only-l glib-2.0)',
-        ],
-      },
+      'toolsets': ['host', 'target'],
+      'conditions': [
+        ['_toolset=="target"', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags glib-2.0)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l glib-2.0)',
+            ],
+          },
+        }, {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(pkg-config --cflags glib-2.0)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(pkg-config --libs-only-L --libs-only-other glib-2.0)',
+            ],
+            'libraries': [
+              '<!@(pkg-config --libs-only-l glib-2.0)',
+            ],
+          },
+        }],
+        ['chromeos==1', {
+          'link_settings': {
+            'libraries': [ '-lXtst' ]
+          }
+        }],
+      ],
     },
     {
       'target_name': 'libresolv',