diff options
| author | 2014-02-12 20:40:28 +0000 | |
|---|---|---|
| committer | 2014-02-12 20:40:28 +0000 | |
| commit | 1f26fb175bf3a10b5e1eb495d22778b47400f323 (patch) | |
| tree | 5d673d359757c3b85f0a646c33b14e8eabd56e70 /compiler/driver/compiler_driver.cc | |
| parent | ae7e954bdb0ab23dac8619bbbe7bb5a2bf4fa6d7 (diff) | |
| parent | 41dcb9f856a2051527cd595f8fe7d200066acba4 (diff) | |
Merge changes I41dcb9f8,I8bc80275
* changes:
Revert "Add a script for running art standalone."
Add StandardSocketOptions to the black list.
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 6d953ed6f9..25d5a42306 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -2109,6 +2109,7 @@ static const char* class_initializer_black_list[] = { "Ljava/net/Inet6Address;", // Sub-class of InetAddress. "Ljava/net/InetUnixAddress;", // Sub-class of InetAddress. "Ljava/net/NetworkInterface;", // Calls to Random.<init> -> System.currentTimeMillis -> OsConstants.initConstants. + "Ljava/net/StandardSocketOptions;", // Call System.identityHashCode. "Ljava/nio/charset/Charset;", // Calls Charset.getDefaultCharset -> System.getProperty -> OsConstants.initConstants. "Ljava/nio/charset/CharsetICU;", // Sub-class of Charset. "Ljava/nio/charset/Charsets;", // Calls Charset.forName. |