Index: content/content_shell.gypi |
diff --git a/content/content_shell.gypi b/content/content_shell.gypi |
index 20b0c98ef3d31355bb4ebe6839b950ac2f3b35fc..cff873121ae6eef79de3ce3867e71ae3aea3e186 100644 |
--- a/content/content_shell.gypi |
+++ b/content/content_shell.gypi |
@@ -146,12 +146,29 @@ |
'<(SHARED_INTERMEDIATE_DIR)/content/shell', |
], |
}], # OS=="android" |
+ ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', { |
+ 'dependencies': [ |
+ # This is needed by content/app/content_main_runner.cc |
+ '../base/allocator/allocator.gyp:allocator', |
+ ], |
+ }], |
['use_aura==1', { |
+ 'dependencies': [ |
+ '../ui/aura/aura.gyp:aura', |
+ '../ui/base/strings/ui_strings.gyp:ui_strings', |
+ '../ui/views/views.gyp:views', |
+ '../ui/ui.gyp:ui_resources', |
+ ], |
'sources/': [ |
['exclude', 'shell/shell_gtk.cc'], |
['exclude', 'shell/shell_win.cc'], |
], |
}], # use_aura==1 |
+ ['chromeos==1', { |
+ 'dependencies': [ |
+ '../chromeos/chromeos.gyp:chromeos', |
+ ], |
+ }], # chromeos==1 |
['inside_chromium_build==0 or component!="shared_library"', { |
'dependencies': [ |
'<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support', |
@@ -323,6 +340,11 @@ |
'<(DEPTH)/build/linux/system.gyp:gtk', |
], |
}], # toolkit_uses_gtk |
+ ['use_aura==1', { |
+ 'dependencies': [ |
+ '../chrome/chrome_resources.gyp:packed_resources', |
+ ], |
+ }], # use_aura |
['OS=="mac"', { |
'product_name': '<(content_shell_product_name)', |
'dependencies!': [ |