commit 12196137b49d0dcecabd7d5eccea9f7f644a207b
author Alice Wang <aliceywang@google.com> Thu Nov 17 14:55:57 2022 +0000
committer Alice Wang <aliceywang@google.com> Mon Nov 21 15:49:20 2022 +0000
tree 43d50e658c4919995b098089734f254bc9e53e65
parent ec163bb9abb690d53e6da8bd13895a4739652533

Add DeviceProperties class to get properties in both host/device tests

Bug: 259384440
Test: atest AuthFsBenchmarks MicrodroidHostTests MicrodroidTests
Change-Id: Ided6b9d71d87bc054cffa95b95af407778ef51f0

tests/helper/Android.bp

diff --git a/tests/helper/Android.bp b/tests/helper/Android.bp
index 86af955..7473dab 100644
--- a/tests/helper/Android.bp
+++ b/tests/helper/Android.bp
@@ -3,15 +3,12 @@
 }
 
 java_library_static {
-    name: "VirtualizationTestHelper",
-    srcs: ["src/java/com/android/virt/**/*.java"],
-    host_supported: true,
-}
-
-java_library_static {
     name: "MicrodroidTestHelper",
     srcs: ["src/java/com/android/microdroid/test/common/*.java"],
     host_supported: true,
+    libs: [
+        "framework-annotations-lib",
+    ],
 }
 
 java_library_static {
@@ -21,7 +18,6 @@
         "androidx.test.runner",
         "androidx.test.ext.junit",
         "MicrodroidTestHelper",
-        "VirtualizationTestHelper",
         "truth-prebuilt",
     ],
     // We need to compile against the .impl library which includes the hidden