Rename device test helper package to com.android.microdroid.test.device
This CL renames the device test helper com.android.microdroid.test to
com.android.microdroid.test.device package to eventually have two
separate separate packages for the device test helper and host
test helper.
Test: atest MicrodroidBenchmarks
Change-Id: I748f8ccda2c94d819ce6f2d75745372db807b693
diff --git a/tests/benchmark/src/java/com/android/microdroid/benchmark/BenchmarkVmListener.java b/tests/benchmark/src/java/com/android/microdroid/benchmark/BenchmarkVmListener.java
index eb45a71..da08a47 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/BenchmarkVmListener.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/BenchmarkVmListener.java
@@ -22,7 +22,7 @@
import android.system.virtualmachine.VirtualMachine;
import android.util.Log;
-import com.android.microdroid.test.MicrodroidDeviceTestBase.VmEventListener;
+import com.android.microdroid.test.device.MicrodroidDeviceTestBase.VmEventListener;
import com.android.microdroid.testservice.IBenchmarkService;
/**
diff --git a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
index 8e65132..cdaf70c 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
@@ -31,8 +31,8 @@
import android.system.virtualmachine.VirtualMachineException;
import android.util.Log;
-import com.android.microdroid.test.MicrodroidDeviceTestBase;
import com.android.microdroid.test.common.MetricsProcessor;
+import com.android.microdroid.test.device.MicrodroidDeviceTestBase;
import com.android.microdroid.testservice.IBenchmarkService;
import org.junit.Before;
diff --git a/tests/helper/Android.bp b/tests/helper/Android.bp
index 6d769e6..f77dae5 100644
--- a/tests/helper/Android.bp
+++ b/tests/helper/Android.bp
@@ -16,7 +16,7 @@
java_library_static {
name: "MicrodroidDeviceTestHelper",
- srcs: ["src/java/com/android/microdroid/test/*.java"],
+ srcs: ["src/java/com/android/microdroid/test/device/*.java"],
static_libs: [
"androidx.test.runner",
"androidx.test.ext.junit",
diff --git a/tests/helper/src/java/com/android/microdroid/test/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
similarity index 99%
rename from tests/helper/src/java/com/android/microdroid/test/MicrodroidDeviceTestBase.java
rename to tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index 3273635..e5bc45a 100644
--- a/tests/helper/src/java/com/android/microdroid/test/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.microdroid.test;
+package com.android.microdroid.test.device;
import static com.google.common.truth.TruthJUnit.assume;
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 5f34cff..0c048b9 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -31,6 +31,7 @@
import android.util.Log;
import com.android.compatibility.common.util.CddTest;
+import com.android.microdroid.test.device.MicrodroidDeviceTestBase;
import com.android.microdroid.testservice.ITestService;
import org.junit.Before;