Revert of [chrome_elf] Big cleanup and removing dependencies that recently crept in. Part 1.

chrome_elf/chrome_elf.gyp

 # Copyright 2013 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,
   },
   'includes': [
     '../build/util/version.gypi',
     '../build/win_precompile.gypi',
@@ skipping 22 matching lines @@
     {
       'target_name': 'chrome_elf',
       'type': 'shared_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
         'chrome_elf.def',
         'chrome_elf_main.cc',
         'chrome_elf_main.h',
+        '../chrome/app/chrome_crash_reporter_client_win.cc',
+        '../chrome/app/chrome_crash_reporter_client_win.h',
         '<(SHARED_INTERMEDIATE_DIR)/chrome_elf/chrome_elf_version.rc',
       ],
       'dependencies': [
         '../chrome/chrome.gyp:install_static_util',
         'blacklist',
-        'chrome_elf_crash',
         'chrome_elf_hook_util',
         'chrome_elf_resources',
         'chrome_elf_security',
         'nt_registry/nt_registry.gyp:chrome_elf_nt_registry',
+        '../chrome/chrome.gyp:install_static_util',
+        '../components/components.gyp:crash_component',
+        '../components/components.gyp:crash_core_common',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
           'conditions': [
             ['target_arch=="ia32"', {
               # Don't set an x64 base address (to avoid breaking HE-ASLR).
               'BaseAddress': '0x01c20000',
             }],
           ],
           # Set /SUBSYSTEM:WINDOWS.
@@ skipping 15 matching lines @@
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
         'chrome_elf_constants.cc',
         'chrome_elf_constants.h',
       ],
     },
     {
-      'target_name': 'chrome_elf_crash',
-      'type': 'static_library',
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        '../chrome/app/chrome_crash_reporter_client_win.cc',
-        '../chrome/app/chrome_crash_reporter_client_win.h',
-        '../chrome/common/chrome_result_codes.h',
-        'crash/crash_helper.cc',
-        'crash/crash_helper.h',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base', # This needs to go.
-        '../base/base.gyp:base_static', # pe_image
-        '../chrome/chrome.gyp:install_static_util',
-        '../components/components.gyp:crash_component',
-        '../components/components.gyp:crash_core_common', #crash_keys
-        'chrome_elf_hook_util',
-      ],
-    },
-    {
       'target_name': 'chrome_elf_hook_util',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
-        '../base/macros.h',
-        'hook_util/hook_util.cc',
-        'hook_util/hook_util.h',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base_static', # pe_image
-        '../sandbox/sandbox.gyp:sandbox',
+        'hook_util/thunk_getter.cc',
+        'hook_util/thunk_getter.h',
       ],
     },
     {
       'target_name': 'chrome_elf_security',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
         'chrome_elf_security.cc',
@@ skipping 26 matching lines @@
         '../base/base.gyp:run_all_unittests',
         '../base/base.gyp:test_support_base',
         '../chrome/chrome.gyp:install_static_util',
         '../sandbox/sandbox.gyp:sandbox',
         '../testing/gtest.gyp:gtest',
         'blacklist',
         'blacklist_test_dll_1',
         'blacklist_test_dll_2',
         'blacklist_test_dll_3',
         'blacklist_test_main_dll',
-        'chrome_elf_crash',
         'chrome_elf_hook_util',
         'chrome_elf_security',
         'nt_registry/nt_registry.gyp:chrome_elf_nt_registry',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
           'DelayLoadDLLs': [
             'dbghelp.dll',
             'ole32.dll',
             'psapi.dll',
@@ skipping 34 matching lines @@
           'dependencies': [
             'chrome_elf_unittests',
           ],
           'includes': [ '../build/isolate.gypi' ],
           'sources': [ 'chrome_elf_unittests.isolate' ],
         },
       ],
     }],
   ],
 }