Clean up uses of use_glib that are not related to glib dependencies

We're frequently using the use_glib gyp variable as a shorthand for: OS!="win" and OS!="mac" and OS!="ios" and OS!="android" This should be equivalent to: desktop_linux == 1 or chromeos == 1 Embedded builds want to remove as many dependencies as possible. This cleans up uses of the use_glib variable so we can turn it off on linux without breaking the build. BUG=316226 Review URL: https://codereview.chromium.org/61923004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233804 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Nov 8, 2013 · b098e1d · b098e1d
1 parent c2901e4
commit b098e1d
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 26 deletions.
diff --git a/base/base.gyp b/base/base.gyp
@@ -35,7 +35,7 @@
         ],
       },
       'conditions': [
-        ['use_glib==1', {
+        ['desktop_linux == 1 or chromeos == 1', {
           'conditions': [
             ['chromeos==1', {
               'sources/': [ ['include', '_chromeos\\.cc$'] ]
@@ -51,7 +51,6 @@
           ],
           'dependencies': [
             'symbolize',
-            '../build/linux/system.gyp:glib',
             'xdg_mime',
           ],
           'defines': [
@@ -60,15 +59,20 @@
           'cflags': [
             '-Wno-write-strings',
           ],
-          'export_dependent_settings': [
-            '../build/linux/system.gyp:glib',
-          ],
-        }, {  # use_glib!=1
+        }, {  # desktop_linux == 0 and chromeos == 0
             'sources/': [
               ['exclude', '/xdg_user_dirs/'],
               ['exclude', '_nss\\.cc$'],
             ],
         }],
+        ['use_glib==1', {
+          'dependencies': [
+            '../build/linux/system.gyp:glib',
+          ],
+          'export_dependent_settings': [
+            '../build/linux/system.gyp:glib',
+          ],
+        }],
         ['use_x11==1', {
           'dependencies': [
             '../build/linux/system.gyp:x11',
@@ -688,7 +692,7 @@
         'module_dir': 'base'
       },
       'conditions': [
-        ['use_glib==1', {
+        ['desktop_linux == 1 or chromeos == 1', {
           'defines': [
             'USE_SYMBOLIZE',
           ],
@@ -749,7 +753,7 @@
             },
           ],
         }],
-        ['use_glib==1', {
+        ['desktop_linux == 1 or chromeos == 1', {
           'sources!': [
             'file_version_info_unittest.cc',
           ],
@@ -764,11 +768,19 @@
             }],
           ],
           'dependencies': [
-            '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:ssl',
+          ],
+        }],
+        ['use_x11 == 1', {
+          'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
-        }, {  # use_glib!=1
+        }],
+        ['use_glib == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:glib',
+          ],
+        }, {  # use_glib == 0
           'sources!': [
             'message_loop/message_pump_glib_unittest.cc',
           ]

diff --git a/base/base.gypi b/base/base.gypi
@@ -699,13 +699,21 @@
           4018,
         ],
         'target_conditions': [
-          ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
+          ['(<(desktop_linux) == 0 and <(chromeos) == 0) or >(nacl_untrusted_build)==1', {
               'sources/': [
                 ['exclude', '^nix/'],
               ],
               'sources!': [
                 'atomicops_internals_x86_gcc.cc',
+              ],
+          }],
+          ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
+              'sources!': [
                 'message_loop/message_pump_glib.cc',
+              ],
+          }],
+          ['<(use_x11)==0 or >(nacl_untrusted_build)==1', {
+              'sources!': [
                 'message_loop/message_pump_x11.cc',
               ],
           }],

diff --git a/net/net.gyp b/net/net.gyp
@@ -1317,6 +1317,8 @@
               '../build/linux/system.gyp:gconf',
               '../build/linux/system.gyp:gio',
             ],
+        }],
+        [ 'desktop_linux == 1 or chromeos == 1', {
             'conditions': [
               ['use_openssl==1', {
                 'dependencies': [
@@ -1998,11 +2000,11 @@
             'net_test_jni_headers',
           ],
         }],
-        [ 'use_glib == 1', {
+        [ 'desktop_linux == 1 or chromeos == 1', {
             'dependencies': [
               '../build/linux/system.gyp:ssl',
             ],
-          }, {  # else use_glib == 0: !posix || mac
+          }, {  # desktop_linux == 0 and chromeos == 0
             'sources!': [
               'cert/nss_cert_database_unittest.cc',
             ],
@@ -2035,7 +2037,7 @@
             'http/mock_gssapi_library_posix.h',
           ],
         }],
-        [ 'use_openssl == 1 or (use_glib == 0 and OS != "ios")', {
+        [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != "ios")', {
           # Only include this test when on Posix and using NSS for
           # cert verification or on iOS (which also uses NSS for certs).
           'sources!': [

diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi
@@ -29,7 +29,7 @@
     [ 'OS != "win"', {
       'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ],
     }],
-    [ 'use_glib == 0', {
+    [ 'desktop_linux == 0 and chromeos == 0', {
       'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
     }],
   ],

diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
@@ -268,7 +268,7 @@
         '../third_party/skia/src/opts/opts_check_SSE2.cpp'
       ],
     }],
-    [ 'use_glib == 1', {
+    [ 'desktop_linux == 1 or chromeos == 1', {
       'dependencies': [
         '../build/linux/system.gyp:fontconfig',
         '../build/linux/system.gyp:freetype2',
@@ -280,13 +280,13 @@
         '-Wno-unused-function',
       ],
     }],
-    [ 'use_glib == 0', {
+    [ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
       'sources!': [
         '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
         '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
       ],
     }],
-    [ 'use_glib == 0 and OS != "android"', {
+    [ 'OS=="win" or OS=="mac" or OS=="ios"', {
       'sources!': [
         '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
         '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',

diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
@@ -226,7 +226,7 @@
             ['exclude', 'cocoa/'],
           ],
         }],
-        ['use_glib == 1 or OS == "ios"', {
+        ['desktop_linux == 1 or chromeos == 1 or OS == "ios"', {
           'dependencies': [
             '../base/strings/ui_strings.gyp:ui_unittest_strings',
           ],

diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp
@@ -191,7 +191,7 @@
         'test/run_all_unittests.cc',
       ],
       'conditions': [
-        ['use_glib == 1 or OS == "ios"', {
+        ['desktop_linux == 1 or chromeos == 1 or OS=="ios"', {
          'dependencies': [
            '../base/strings/ui_strings.gyp:ui_unittest_strings',
          ],

diff --git a/ui/ui.gyp b/ui/ui.gyp
@@ -402,6 +402,8 @@
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:glib',
           ],
+        }],
+        ['desktop_linux == 1 or chromeos == 1', {
           'conditions': [
             ['toolkit_views==0 and use_aura==0', {
               # Note: because of gyp predence rules this has to be defined as
@@ -419,11 +421,11 @@
                 ['include', '^base/dragdrop/os_exchange_data.cc'],
               ],
             }],
-            ['use_pango==1', {
-              'dependencies': [
-                '../build/linux/system.gyp:pangocairo',
-              ],
-            }],
+          ],
+        }],
+        ['use_pango==1', {
+          'dependencies': [
+            '../build/linux/system.gyp:pangocairo',
           ],
         }],
         ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {

diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
@@ -265,7 +265,7 @@
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
-        ['use_glib == 1 or OS == "ios"', {
+        ['desktop_linux == 1 or chromeos == 1 or OS == "ios"', {
           'dependencies': [
             'base/strings/ui_strings.gyp:ui_unittest_strings',
           ],