commit 3825c24b63cd394bf0c947996a9bbe288ad813d1
author Narayan Kamath <narayan@google.com> Fri Apr 15 19:04:51 2016 +0100
committer Narayan Kamath <narayan@google.com> Fri Apr 15 19:04:51 2016 +0100
tree ae88d09f19c43d6ae0029ea1829d1eb5163cc67c
parent 8f9c9cae00ad906c39891890f7b9d7a0bc453c0a

Fix art/test/119-noimage-patchoat.

Add an explicit size to the map to ensure that it doesn't resize
during <clinit>. Resizing the map will call through to a Math function
that needs a native implementation, thereby creating a circular
dependency.

bug: 28082128
Change-Id: Icafcf50e93a5ee4a0372ac73ca1e72b229c31dd9

libart/src/main/java/dalvik/system/VMRuntime.java

diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index 9b7d24a..74aedd4 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -39,7 +39,7 @@
     // instruction set name should not exceed 7 characters. See installd
     // and the package manager for the actual propeties.
     private static final Map<String, String> ABI_TO_INSTRUCTION_SET_MAP
-            = new HashMap<String, String>();
+            = new HashMap<String, String>(16);
     static {
         ABI_TO_INSTRUCTION_SET_MAP.put("armeabi", "arm");
         ABI_TO_INSTRUCTION_SET_MAP.put("armeabi-v7a", "arm");