Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / chrome_dll.gypi

diff --git a/src/chrome/chrome_dll.gypi b/src/chrome/chrome_dll.gypi
index e689c45..13756e1 100644 (file)
--- a/src/chrome/chrome_dll.gypi
+++ b/src/chrome/chrome_dll.gypi
@@ -82,6 +82,11 @@
             '../content/content.gyp:content_app_browser',
           ],
           'conditions': [
+            ['OS=="win"', {
+              'dependencies': [
+                '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
+              ],
+            }],
             ['use_aura==1', {
               'dependencies': [
                 '../ui/compositor/compositor.gyp:compositor',
@@ -99,7 +104,6 @@
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
                 # up actual Chromium functionality into this .dll.
-                'chrome_dll_pdb_workaround',
                 'chrome_version_resources',
                 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
                 '../crypto/crypto.gyp:crypto',
@@ -211,6 +215,11 @@
                     '../printing/printing.gyp:printing',
                   ],
                 }],
+                ['component!="shared_library"', {  # http://crbug.com/339215
+                  'dependencies': [
+                    'chrome_dll_pdb_workaround',
+                   ],
+                }],
               ]
             }],
             ['chrome_multiple_dll==1', {
@@ -354,6 +363,13 @@
             'app/chrome_main_delegate.cc',
             'app/chrome_main_delegate.h',
           ],
+          'conditions': [
+            ['OS=="win"', {
+              'dependencies': [
+                '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
+              ],
+            }],
+          ],
         },  # target chrome_child_dll
       ],
     }],