summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/tests/servicestests/Android.mk4
-rw-r--r--services/tests/servicestests/utils/com/android/server/testutils/OffsettableClock.java (renamed from services/tests/servicestests/src/com/android/server/testutils/OffsettableClock.java)0
-rw-r--r--services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java (renamed from services/tests/servicestests/src/com/android/server/testutils/TestHandler.java)0
-rw-r--r--services/tests/servicestests/utils/com/android/server/testutils/TestUtils.java (renamed from services/tests/servicestests/src/com/android/server/testutils/TestUtils.java)0
4 files changed, 3 insertions, 1 deletions
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk
index a85f21cda901..bf7836d42008 100644
--- a/services/tests/servicestests/Android.mk
+++ b/services/tests/servicestests/Android.mk
@@ -9,7 +9,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := \
+ $(call all-java-files-under, src) \
+ $(call all-java-files-under, utils) \
LOCAL_STATIC_JAVA_LIBRARIES := \
frameworks-base-testutils \
diff --git a/services/tests/servicestests/src/com/android/server/testutils/OffsettableClock.java b/services/tests/servicestests/utils/com/android/server/testutils/OffsettableClock.java
index 8dabbc4d4356..8dabbc4d4356 100644
--- a/services/tests/servicestests/src/com/android/server/testutils/OffsettableClock.java
+++ b/services/tests/servicestests/utils/com/android/server/testutils/OffsettableClock.java
diff --git a/services/tests/servicestests/src/com/android/server/testutils/TestHandler.java b/services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java
index 1222b59e92b9..1222b59e92b9 100644
--- a/services/tests/servicestests/src/com/android/server/testutils/TestHandler.java
+++ b/services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java
diff --git a/services/tests/servicestests/src/com/android/server/testutils/TestUtils.java b/services/tests/servicestests/utils/com/android/server/testutils/TestUtils.java
index b200293ee916..b200293ee916 100644
--- a/services/tests/servicestests/src/com/android/server/testutils/TestUtils.java
+++ b/services/tests/servicestests/utils/com/android/server/testutils/TestUtils.java