Revert 107967 - Introduces chromium_resources.gyp to factor out Chrome resource generation

views/views.gyp

 # Copyright (c) 2011 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.
+
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'target_defaults': {
     'conditions': [
       ['OS=="win"', {'sources/': [
         ['include', '_(win)\\.cc$'],
         ['include', '/win/'],
@@ skipping 528 matching lines @@
           ],
         }],
       ],
     },
     {
       'target_name': 'views_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
-        # TODO(jcivelli): ideally the resource needed by views would be
-        #                 factored out. (for some reason it pulls in a bunch
-        #                 unrelated things like v8, sqlite nss...).
-        '../chrome/chrome_resources.gyp:packed_resources',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
         '../ui/gfx/compositor/compositor.gyp:test_compositor',
         '../ui/ui.gyp:gfx_resources',
@@ skipping 95 matching lines @@
             ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'],
             ['exclude', 'controls/table/table_view_unittest.cc'],
             ['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'],
           ],
         }, {
           'sources/': [
             ['exclude', '../ui/aura/test/test_desktop_delegate.cc'],
             ['exclude', '../ui/aura/test/test_desktop_delegate.h'],
           ],
         }],
+        ['OS!="mac"', {
+          'dependencies': [
+            # TODO(jcivelli): ideally the resource needed by views would be
+            #                 factored out. (for some reason it pulls in a bunch
+            #                 unrelated things like v8, sqlite nss...).
+            '../chrome/chrome.gyp:packed_resources',
+           ],
+        }],
       ],
     },
     {
       'target_name': 'views_examples',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
-        '../chrome/chrome_resources.gyp:packed_resources',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:gfx_resources',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         'views',
       ],
       'include_dirs': [
@@ skipping 79 matching lines @@
           'msvs_settings': {
             'VCManifestTool': {
               'AdditionalManifestFiles': '$(ProjectDir)\\examples\\views_examples.exe.manifest',
             },
           },
           'sources': [
             'examples/table_example.cc',
             'examples/table_example.h',
           ],
         }],
+        ['OS!="mac"', {
+          'dependencies': [
+            '../chrome/chrome.gyp:packed_resources',
+           ],
+        }],
       ],
     },
     {
       'target_name': 'views_desktop_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        '../chrome/chrome_resources.gyp:packed_resources',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/gfx/compositor/compositor.gyp:compositor',
         '../ui/ui.gyp:gfx_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         'views',
       ],
       'include_dirs': [
@@ skipping 25 matching lines @@
           'link_settings': {
             'libraries': [
               '-limm32.lib',
               '-loleacc.lib',
             ]
           },
           'include_dirs': [
             '../third_party/wtl/include',
           ],
         }],
+        ['OS!="mac"', {
+          'dependencies': [
+            '../chrome/chrome.gyp:packed_resources',
+           ],
+        }],
       ],
     },
     {
       'target_name': 'views_desktop',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
-        '../chrome/chrome_resources.gyp:packed_resources',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/ui.gyp:gfx_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         '../ui/gfx/compositor/compositor.gyp:compositor',
         'views',
         'views_desktop_lib',
@@ skipping 32 matching lines @@
           'link_settings': {
             'libraries': [
               '-limm32.lib',
               '-loleacc.lib',
             ]
           },
           'include_dirs': [
             '../third_party/wtl/include',
           ],
         }],
+        ['OS!="mac"', {
+          'dependencies': [
+            '../chrome/chrome.gyp:packed_resources',
+           ],
+        }],
       ],
     },
   ],
   'conditions': [
     ['use_aura==1', {
       'targets': [
         {
           'target_name': 'views_aura_desktop',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../chrome/chrome_resources.gyp:packed_resources',
             '../skia/skia.gyp:skia',
             '../third_party/icu/icu.gyp:icui18n',
             '../third_party/icu/icu.gyp:icuuc',
             '../ui/aura/aura.gyp:aura',
             '../ui/ui.gyp:gfx_resources',
             '../ui/ui.gyp:ui',
             '../ui/ui.gyp:ui_resources',
             '../ui/ui.gyp:ui_resources_standard',
             'views',
           ],
@@ skipping 11 matching lines @@
               'link_settings': {
                 'libraries': [
                   '-limm32.lib',
                   '-loleacc.lib',
                 ]
               },
               'include_dirs': [
                 '../third_party/wtl/include',
               ],
             }],
+            ['OS!="mac"', {
+              'dependencies': [
+                '../chrome/chrome.gyp:packed_resources',
+               ],
+            }],
           ],
         },
       ],
     }],
   ],
 }