commit 573cfa44e420d268c342cce93c88e73f705f3d16
author Tadashi G. Takaoka <takaoka@google.com> Tue Mar 06 12:51:21 2018 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Mar 08 08:41:12 2018 +0900
tree 3c59ba1b5b17e8f46f61fa3cfae0fcfd468498a5
parent 5f17e45129493b75b36b408f19e97f1b092cb210

Use ComponentName for VirtualDisplayService

This CL also moves DisplayHelper class to CTS APK as VirtualDisplayHelper,
and consolidates constants.

Bug: 73349193
Bug: 74043419
Test: No new test starts failing.
  atest CtsActivityManagerDeviceTestCases:ActivityManagerMultiDisplayTests
Change-Id: I4930715d3861dcc19ef2a97aeccc1a2fda965f10

tests/framework/base/activitymanager/Android.mk

diff --git a/tests/framework/base/activitymanager/Android.mk b/tests/framework/base/activitymanager/Android.mk
index 797610a..56db56d 100644
--- a/tests/framework/base/activitymanager/Android.mk
+++ b/tests/framework/base/activitymanager/Android.mk
@@ -32,13 +32,13 @@
     $(call all-named-files-under,Components.java, appPrereleaseSdk) \
     $(call all-named-files-under,Components.java, appSecondUid) \
     $(call all-named-files-under,Components.java, appThirdUid) \
+    $(call all-named-files-under,Components.java, displayserviceapp) \
     $(call all-named-files-under,Components.java, translucentapp) \
     $(call all-named-files-under,Components.java, translucentappsdk26) \
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    cts-amwm-util \
-    cts-display-service-app-util
+    cts-amwm-util
 
 LOCAL_CTS_TEST_PACKAGE := android.server