diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-01 09:29:04 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-01 09:29:04 -0700 |
| commit | 0b4e3ef67508a0b8c121b6b26ab5ea0a1d8e7141 (patch) | |
| tree | fc53640b73fb2f648e018a15bed8585818f3784f /src/compiler/driver/compiler_driver.cc | |
| parent | 3e089ee6ef1e33c5ff6405b209c4f14a123c0e7e (diff) | |
| download | android_art-0b4e3ef67508a0b8c121b6b26ab5ea0a1d8e7141.tar.gz android_art-0b4e3ef67508a0b8c121b6b26ab5ea0a1d8e7141.tar.bz2 android_art-0b4e3ef67508a0b8c121b6b26ab5ea0a1d8e7141.zip | |
Add StandardCharsets to the class_initializer_black_list
Change-Id: Id13a58fc6da8a2c39f47bcee14a743c88fc899b7
Diffstat (limited to 'src/compiler/driver/compiler_driver.cc')
| -rw-r--r-- | src/compiler/driver/compiler_driver.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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. |