diff options
| author | 2013-03-10 20:26:16 -0700 | |
|---|---|---|
| committer | 2013-03-11 15:47:02 -0700 | |
| commit | bd86bccf1b47f1151842152ee52cf5d46d6b34ab (patch) | |
| tree | c0c110b47435c6e8548f1b7126f9ea20da7fd934 /src/compiler/driver/compiler_driver.cc | |
| parent | 5d021c7399fa8090910d5b47ed00465a4e0e7e0f (diff) | |
Tracking rebase to jb-mr1-release
Change-Id: Ic2ae1a27682cc4152003a68d59068b2c5c5eb09b
Diffstat (limited to 'src/compiler/driver/compiler_driver.cc')
| -rw-r--r-- | src/compiler/driver/compiler_driver.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/driver/compiler_driver.cc b/src/compiler/driver/compiler_driver.cc index 8556cc8366..9ed763cdfd 100644 --- a/src/compiler/driver/compiler_driver.cc +++ b/src/compiler/driver/compiler_driver.cc @@ -1329,6 +1329,7 @@ static const char* class_initializer_black_list[] = { "Landroid/net/Uri$StringUri;", // Requires Uri. "Landroid/net/WebAddress;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. "Landroid/nfc/NdefRecord;", // Calls String.getBytes -> java.nio.charset.Charset. + "Landroid/opengl/EGL14;", // Calls android.opengl.EGL14._nativeClassInit. "Landroid/opengl/GLES10;", // Calls android.opengl.GLES10._nativeClassInit. "Landroid/opengl/GLES10Ext;", // Calls android.opengl.GLES10Ext._nativeClassInit. "Landroid/opengl/GLES11;", // Requires GLES10. @@ -1350,6 +1351,7 @@ static const char* class_initializer_black_list[] = { "Landroid/server/BluetoothService;", // Calls android.server.BluetoothService.classInitNative. "Landroid/server/BluetoothEventLoop;", // Calls android.server.BluetoothEventLoop.classInitNative. "Landroid/telephony/PhoneNumberUtils;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/telephony/TelephonyManager;", // Calls OsConstants.initConstants. "Landroid/text/AutoText;", // Requires android.util.DisplayMetrics -..-> android.os.SystemProperties.native_get_int. "Landroid/text/Layout;", // Calls com.android.internal.util.ArrayUtils.emptyArray -> System.identityHashCode. "Landroid/text/BoringLayout;", // Requires Layout. |