commit 8b0a647a1144ca9fe600014d36a25e13012a99f5
author Sunny Goyal <sunnygoyal@google.com> Mon Nov 06 21:09:23 2017 -0800
committer Sunny Goyal <sunnygoyal@google.com> Mon Nov 06 21:10:09 2017 -0800
tree 30c6cc70a3789f977624f0926e7fd46b50a34d04
parent ba9609d35c88a1604c1fb206af1fb75735c461b3

Removing dependency on deprecated android.test.** package

Change-Id: Ib1065e26fff3c193d12531c8bca944693ea6137c

build.gradle

diff --git a/build.gradle b/build.gradle
index f357e5c..61c05e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,18 +80,18 @@
         }
 
         aosp {
-            java.srcDirs = ['src_flags']
+            java.srcDirs = ['src_flags', "src_ui_overrides"]
         }
 
         l3go {
             res.srcDirs = ['go/res']
-            java.srcDirs = ['go/src_flags']
+            java.srcDirs = ['go/src_flags', "src_ui_overrides"]
             manifest.srcFile "go/AndroidManifest.xml"
         }
 
         quickstep {
             res.srcDirs = ['quickstep/res']
-            java.srcDirs = ['quickstep/src_flags', 'quickstep/src']
+            java.srcDirs = ['src_flags', 'quickstep/src']
             manifest.srcFile "quickstep/AndroidManifest.xml"
         }
     }
@@ -115,7 +115,8 @@
     androidTestCompile "org.mockito:mockito-core:1.9.5"
     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:runner:1.0.0'
+    androidTestCompile 'com.android.support.test:rules:1.0.0'
     androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
     androidTestCompile "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}"
 }