diff options
| author | Narayan Kamath <narayan@google.com> | 2014-08-22 07:47:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 07:47:38 +0000 |
| commit | 97a50adde5eaee4216d537b2a90a9f33533d2926 (patch) | |
| tree | f9bf1add488d9ca2752b53a79cfe2ccae1229fe5 /services | |
| parent | dbe6b45545dcd28e6aaf46986ed694196eb94de0 (diff) | |
| parent | d8b54e831dc59ea5f903f0e920a64cf2411dd3ab (diff) | |
| download | frameworks_base-97a50adde5eaee4216d537b2a90a9f33533d2926.zip frameworks_base-97a50adde5eaee4216d537b2a90a9f33533d2926.tar.gz frameworks_base-97a50adde5eaee4216d537b2a90a9f33533d2926.tar.bz2 | |
Merge "Fix service tests." into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/tests/servicestests/Android.mk | 4 | ||||
| -rw-r--r-- | services/tests/servicestests/AndroidManifest.xml | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 4ff3899..f25fc62 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -8,11 +8,13 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ + services.core \ + services.devicepolicy \ easymocklib \ guava \ mockito-target -LOCAL_JAVA_LIBRARIES := android.test.runner services +LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksServicesTests diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml index 636dd4d..19a199e 100644 --- a/services/tests/servicestests/AndroidManifest.xml +++ b/services/tests/servicestests/AndroidManifest.xml @@ -39,6 +39,7 @@ <application> <uses-library android:name="android.test.runner" /> + <uses-library android:name="services" /> <service android:name="com.android.server.AccessibilityManagerServiceTest$MyFirstMockAccessibilityService" android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"> |