From adca42dd841bd394bcba7c769f4bbe3d9078a2a8 Mon Sep 17 00:00:00 2001 From: Julius D'souza Date: Tue, 13 Sep 2016 10:40:07 -0700 Subject: [PATCH] Use tradefed AbiUtils Bug: 31234712 Change-Id: Ia025471a3626d2d3163a4d1f3be6cad0e643ca97 --- android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java | 2 +- .../tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java index 4a27522..67af482 100644 --- a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java +++ b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java @@ -16,7 +16,6 @@ package com.drawelements.deqp.runner; import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper; -import com.android.compatibility.common.util.AbiUtils; import com.android.ddmlib.AdbCommandRejectedException; import com.android.ddmlib.IShellOutputReceiver; import com.android.ddmlib.MultiLineReceiver; @@ -42,6 +41,7 @@ import com.android.tradefed.testtype.IRuntimeHintProvider; import com.android.tradefed.testtype.IShardableTest; import com.android.tradefed.testtype.ITestCollector; import com.android.tradefed.testtype.ITestFilterReceiver; +import com.android.tradefed.util.AbiUtils; import com.android.tradefed.util.IRunUtil; import com.android.tradefed.util.RunInterruptedException; import com.android.tradefed.util.RunUtil; diff --git a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java index 5c2ac0b..7fd6e2e 100644 --- a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java +++ b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java @@ -16,7 +16,6 @@ package com.drawelements.deqp.runner; import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper; -import com.android.compatibility.common.util.AbiUtils; import com.android.ddmlib.IDevice; import com.android.ddmlib.IShellOutputReceiver; import com.android.ddmlib.ShellCommandUnresponsiveException; @@ -31,6 +30,7 @@ import com.android.tradefed.testtype.Abi; import com.android.tradefed.testtype.IAbi; import com.android.tradefed.testtype.IRemoteTest; import com.android.tradefed.testtype.IRuntimeHintProvider; +import com.android.tradefed.util.AbiUtils; import com.android.tradefed.util.IRunUtil; import com.android.tradefed.util.RunInterruptedException; -- 2.7.4