Index: content/shell/app/shell_main.cc |
diff --git a/content/shell/app/shell_main.cc b/content/shell/app/shell_main.cc |
index 4a04d8d826f44e47631811bd41e5da4d0204a49b..338570f56585d6559cc17f484bad0a8eb65c4b39 100644 |
--- a/content/shell/app/shell_main.cc |
+++ b/content/shell/app/shell_main.cc |
@@ -16,7 +16,14 @@ |
#if defined(OS_WIN) |
+#if !defined(ADDRESS_SANITIZER) |
int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
+#else |
+// The AddressSanitizer build should be a console program as it prints out stuff |
+// on stderr. |
+int main() { |
+ HINSTANCE instance = GetModuleHandle(NULL); |
+#endif |
sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
content::InitializeSandboxInfo(&sandbox_info); |
content::ShellMainDelegate delegate; |