From 0b4e3ef67508a0b8c121b6b26ab5ea0a1d8e7141 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Mon, 1 Jul 2013 09:29:04 -0700 Subject: Add StandardCharsets to the class_initializer_black_list Change-Id: Id13a58fc6da8a2c39f47bcee14a743c88fc899b7 --- src/compiler/driver/compiler_driver.cc | 1 + 1 file changed, 1 insertion(+) (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 122988aa5b..24299ea9bc 100644 --- a/src/compiler/driver/compiler_driver.cc +++ b/src/compiler/driver/compiler_driver.cc @@ -1850,6 +1850,7 @@ static const char* class_initializer_black_list[] = { "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. + "Ljava/nio/charset/StandardCharsets;", // Calls OsConstants.initConstants. "Ljava/security/AlgorithmParameterGenerator;", // Calls OsConstants.initConstants. "Ljava/security/KeyPairGenerator$KeyPairGeneratorImpl;", // Calls OsConstants.initConstants. "Ljava/security/KeyPairGenerator;", // Calls OsConstants.initConstants. -- cgit v1.2.3-59-g8ed1b