commit | 59e5384d894836ace0b8ea22ff12d26ffb3026d4 | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Sun Oct 07 16:40:15 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Oct 07 16:40:15 2012 -0700 |
tree | 468a1abd5e07a7e885796904fdd76b6272fa4187 | |
parent | 4445a7e3398a6143939168097a3aa275b734504d [diff] | |
parent | 9a936999236cc29eacc95e87ed65a04db73f00f3 [diff] |
Merge "See if running single-threaded fixes dex2oat Mac crashes." into dalvik-dev
diff --git a/src/dex2oat.cc b/src/dex2oat.cc index 28960b9..c96620e 100644 --- a/src/dex2oat.cc +++ b/src/dex2oat.cc
@@ -493,7 +493,7 @@ uintptr_t image_base = 0; UniquePtr<std::string> host_prefix; std::vector<const char*> runtime_args; -#if defined(ART_USE_QUICK_COMPILER) +#if defined(ART_USE_QUICK_COMPILER) || defined(__APPLE__) int thread_count = 1; #else int thread_count = sysconf(_SC_NPROCESSORS_CONF);