| commit | 60c59ca7eff486f674261b36d2d453f68bf0115d | [log] [tgz] |
|---|---|---|
| author | Jesse Wilson <jessewilson@google.com> | Fri Mar 02 19:57:40 2012 -0500 |
| committer | Jesse Wilson <jessewilson@google.com> | Fri Mar 02 19:57:40 2012 -0500 |
| tree | e196227f068c3f141659a6324fb482412011f254 | |
| parent | 1bccfdaae43f2f10c5a440bccfa535d059e1654e [diff] |
Track mockito change to not use META-INF, since that directory is ignored by Android tools. Also remove vogar-specific hack for the on-device dex directory.
diff --git a/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java b/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java index 4621d93..e108ab9 100644 --- a/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java +++ b/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
@@ -33,10 +33,6 @@ public <T> T createMock(Class<T> typeToMock, Class<?>[] extraInterfaces, MockitoInvocationHandler handler, MockSettingsInfo settings) { - // TODO - System.setProperty("dexmaker.dexcache", "/data/vogar"); // TODO - // TODO - InvocationHandler invocationHandler = new InvocationHandlerAdapter(handler); if (typeToMock.isInterface()) {
diff --git a/src/mockito/resources/META-INF/services/org.mockito.plugins.MockMaker b/src/mockito/resources/services/org.mockito.plugins.MockMaker similarity index 100% rename from src/mockito/resources/META-INF/services/org.mockito.plugins.MockMaker rename to src/mockito/resources/services/org.mockito.plugins.MockMaker