| commit | 9809f45fa7f8f0fbff56c898ea253cc8f8fde2b8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 04 20:11:19 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jan 04 20:11:20 2017 +0000 |
| tree | f550ea925e5b3e9350329a0df1c6ec0d5a341a95 | |
| parent | 3a32e9b2526bd2c5edaea61eab316b0271975677 [diff] | |
| parent | 9f8a40abfa3396381218f3769e988c58d62eb637 [diff] |
Merge "dalvik: Accept custom --vm to a degree"
diff --git a/Android.mk b/Android.mk index cb402a8..d65a198 100644 --- a/Android.mk +++ b/Android.mk
@@ -90,7 +90,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ caliper-host \ - junit \ + junit-host \ mockito-host # Use Dagger2 annotation processor @@ -114,7 +114,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ caliper-host \ - junit \ + junit-host \ mockito-host LOCAL_JAVA_LANGUAGE_VERSION := 1.7