Move functional tests into separate test target.

Also separate out support code from unittests.

Change-Id: I81490950373e170c857b23468da8d97d6aaf50d9

2 files changed, 3 insertions, 5 deletions

diff --git a/perf-tests/Android.mk b/perf-tests/Android.mk
index 7cbc5fe3d..62b331b50 100644
--- a/perf-tests/Android.mk
+++ b/perf-tests/Android.mk
@@ -5,10 +5,8 @@ LOCAL_MODULE_TAGS := tests
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    $(call all-java-files-under, ../tests/src/com/android/documentsui/bots) \
-    ../tests/src/com/android/documentsui/DocumentsProviderHelper.java \
-    ../tests/src/com/android/documentsui/StubProvider.java \
-    ../tests/src/com/android/documentsui/functional/ActivityTest.java
+    $(call all-java-files-under, ../tests/common/com/android/documentsui) \
+    ../tests/functional/com/android/documentsui/ActivityTest.java
 
 LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
 LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator ub-janktesthelper espresso-core
diff --git a/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java b/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
index 921a3eae8..ee0c9299c 100644
--- a/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
+++ b/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
@@ -28,7 +28,7 @@ import android.test.suitebuilder.annotation.LargeTest;
 
 import com.android.documentsui.BaseActivity.EventListener;
 import com.android.documentsui.base.RootInfo;
-import com.android.documentsui.functional.ActivityTest;
+import com.android.documentsui.ActivityTest;
 import com.android.documentsui.manager.ManageActivity;
 
 import java.util.ArrayList;