| commit | 36ca51ffbce05dc5418b7e96b25f3ece89bdbaeb | [log] [tgz] |
|---|---|---|
| author | Tadashi G. Takaoka <takaoka@google.com> | Tue Sep 18 08:40:56 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 18 08:40:56 2018 -0700 |
| tree | cdb21b47ba326a47196ecf7cb495e1bbbe929fee | |
| parent | fce565d2e20811ede8c6bad674e617ae3ca52678 [diff] | |
| parent | 5c06c1c06188afbf1c4e00bd78bf59590d894911 [diff] |
Merge "Separate servicestests/utils" am: 5c06c1c061 Change-Id: Ie152d348d9b37abcd77c01758088fd1f6c78afed
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index a85f21c..bf7836d 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk
@@ -9,7 +9,9 @@ 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 similarity index 100% rename from services/tests/servicestests/src/com/android/server/testutils/OffsettableClock.java rename to 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 similarity index 100% rename from services/tests/servicestests/src/com/android/server/testutils/TestHandler.java rename to 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 similarity index 100% rename from services/tests/servicestests/src/com/android/server/testutils/TestUtils.java rename to services/tests/servicestests/utils/com/android/server/testutils/TestUtils.java