From f08e473519dc5c7ccb85eb2b333f9d0aff23a329 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 9 Apr 2013 09:45:49 -0700 Subject: Fix abort regression. Change https://googleplex-android-review.googlesource.com/#/c/249463/ set a boolean prior to testing it meaning that all aborts were seen as recursive and no meaningful log information was given. Also a fix related to https://googleplex-android-review.googlesource.com/293665 where we were attempting to dump other threads stacks during aborting even though those threads weren't suspended. Change-Id: I1f848512c5e380529579db3d16bb8f5ddda36ad3 --- src/compiler/driver/compiler_driver.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/compiler/driver/compiler_driver.cc') diff --git a/src/compiler/driver/compiler_driver.cc b/src/compiler/driver/compiler_driver.cc index 9db9ee8124..7ce01eda87 100644 --- a/src/compiler/driver/compiler_driver.cc +++ b/src/compiler/driver/compiler_driver.cc @@ -1397,7 +1397,7 @@ static const char* class_initializer_black_list[] = { "Ljavax/net/ssl/HttpsURLConnection;", // Calls SSLSocketFactory.getDefault -> java.security.Security.getProperty. "Llibcore/icu/LocaleData;", // Requires java.util.Locale. "Llibcore/icu/TimeZoneNames;", // Requires java.util.TimeZone. - "Llibcore/io/IoUtils;", // Calls OsConstants.initConstants. + "Llibcore/io/IoUtils;", // Calls Random. -> System.currentTimeMillis -> FileDescriptor -> OsConstants.initConstants. "Llibcore/io/OsConstants;", // Platform specific. "Llibcore/net/MimeUtils;", // Calls libcore.net.MimeUtils.getContentTypesPropertiesStream -> System.getProperty. "Llibcore/util/ZoneInfo;", // Sub-class of TimeZone. -- cgit v1.2.3-59-g8ed1b