Permalink
Browse files

Merge pull request #275 from metalhead8816/upstream_lrucache

Don't shadow LruCache since the full java source is available and usable
  • Loading branch information...
2 parents 65b0931 + 8c52966 commit 8e3a5a9eaaf54c5c3ab4edb753a3577755052689 @tylerschultz tylerschultz committed Jun 13, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 src/main/java/com/xtremelabs/robolectric/bytecode/AndroidTranslator.java
@@ -15,7 +15,7 @@
* IMPORTANT -- increment this number when the bytecode generated for modified classes changes
* so the cache file can be invalidated.
*/
- public static final int CACHE_VERSION = 20;
+ public static final int CACHE_VERSION = 21;
private static final List<ClassHandler> CLASS_HANDLERS = new ArrayList<ClassHandler>();
@@ -34,6 +34,7 @@ public AndroidTranslator(ClassHandler classHandler, ClassCache classCache) {
instrumentingList.add("org.apache.http.impl.client.DefaultRequestDirector");
instrumentingExcludeList.add("android.support.v4.content.LocalBroadcastManager");
+ instrumentingExcludeList.add("android.support.v4.util.LruCache");
}
public AndroidTranslator(ClassHandler classHandler, ClassCache classCache, List<String> customShadowClassNames) {

0 comments on commit 8e3a5a9

Please sign in to comment.