| commit | 9259176007f5aad8fb9c79abb725b40c89327c40 | [log] [tgz] |
|---|---|---|
| author | Aaron Holden <aaronholden@google.com> | Wed Dec 07 18:52:10 2016 -0800 |
| committer | Aaron Holden <aaronholden@google.com> | Mon Dec 12 12:27:20 2016 -0800 |
| tree | 3e1db0cabb401a8ecd2775b99fc63397a567d431 | |
| parent | 3e0f95f870e73589c01082fd720da162d8d90e48 [diff] |
Move libs/deviceutil to device-side/util Test: build cts, run unit tests bug:21762834 Change-Id: Ifd164ced7f040e312e3553f27adf59a648f463ab
diff --git a/hostsidetests/ui/control/Android.mk b/hostsidetests/ui/control/Android.mk index 5365a6f..fa63c59 100644 --- a/hostsidetests/ui/control/Android.mk +++ b/hostsidetests/ui/control/Android.mk
@@ -20,7 +20,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner +LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/hostsidetests/ui/control/src/android/taskswitching/control/cts/TaskSwitchingDeviceTest.java b/hostsidetests/ui/control/src/android/taskswitching/control/cts/TaskSwitchingDeviceTest.java index 358e1ac..6b99c20 100644 --- a/hostsidetests/ui/control/src/android/taskswitching/control/cts/TaskSwitchingDeviceTest.java +++ b/hostsidetests/ui/control/src/android/taskswitching/control/cts/TaskSwitchingDeviceTest.java
@@ -25,7 +25,7 @@ import android.content.Intent; import android.content.IntentFilter; -import android.cts.util.CtsAndroidTestCase; +import com.android.compatibility.common.util.CtsAndroidTestCase; import com.android.compatibility.common.util.DeviceReportLog; import com.android.compatibility.common.util.MeasureRun;