diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-11-10 00:50:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-10 00:50:22 +0000 |
commit | 1ef74f5151e24d6b0cfcd3faf2c4cc2bdf7ae35c (patch) | |
tree | a703cf47e54306c47bd846112bf761ce133d48c2 /build.gradle | |
parent | 4ece6ed261b13f535618845552926bfd65a67be6 (diff) | |
parent | f0ba8b7ca1dc8fd53451d3d16e9f4fc306cddcd4 (diff) | |
download | android_packages_apps_Trebuchet-1ef74f5151e24d6b0cfcd3faf2c4cc2bdf7ae35c.tar.gz android_packages_apps_Trebuchet-1ef74f5151e24d6b0cfcd3faf2c4cc2bdf7ae35c.tar.bz2 android_packages_apps_Trebuchet-1ef74f5151e24d6b0cfcd3faf2c4cc2bdf7ae35c.zip |
Merge "Moving various runnables in LauncherModel to individual tasks" into ub-launcher3-master
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build.gradle b/build.gradle index 66cba5925..4629caae3 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,7 @@ android { androidTest { java.srcDirs = ['tests/src'] + res.srcDirs = ['tests/res'] manifest.srcFile "tests/AndroidManifest.xml" } @@ -65,6 +66,9 @@ dependencies { compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-2' testCompile 'junit:junit:4.12' + androidTestCompile "org.mockito:mockito-core:1.+" + androidTestCompile 'com.google.dexmaker:dexmaker:1.2' + androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' androidTestCompile 'com.android.support:support-annotations:23.2.0' |