Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Unified Diff: gpu/command_buffer/common/unittest_main.cc

Issue 10695047: Enable debugging code for non-official Android builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | skia/skia.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/common/unittest_main.cc
diff --git a/gpu/command_buffer/common/unittest_main.cc b/gpu/command_buffer/common/unittest_main.cc
index 7539d9ff5a6b558fc8ee3db4d961cf6bd69123b1..c48aedfb0ce9ac26d9e9d1b41dcd992f8dca7913 100644
--- a/gpu/command_buffer/common/unittest_main.cc
+++ b/gpu/command_buffer/common/unittest_main.cc
@@ -9,7 +9,12 @@
#include "ui/gl/gl_implementation.h"
int main(int argc, char** argv) {
+ // On Android, AtExitManager is created in
+ // testing/android/native_test_wrapper.cc before main() is called.
+ // The same thing is also done in base/test/test_suite.cc
+#if !defined(OS_ANDROID)
base::AtExitManager exit_manager;
+#endif
gfx::InitializeGLBindings(gfx::kGLImplementationMockGL);
CommandLine::Init(argc, argv);
testing::InitGoogleMock(&argc, argv);
« no previous file with comments | « build/common.gypi ('k') | skia/skia.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698