Merge "Attempt to run mkbootimg_test as part of unit tests CI" am: 45e0eea0dc am: d19d0b9dae am: 6329cde2af am: 0691fd1fef

Original change: https://android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/1664783

Change-Id: I414b503818c8b9a71acac29160a5f4fabf781e4f

1 files changed, 5 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index b0fe1e4..23c55b8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -98,14 +98,11 @@ python_test_host {
     ],
     data: [
         ":avbtool",
+        ":mkbootimg",
+        ":unpack_bootimg",
         "tests/data/*",
     ],
-    required: [
-        "avbtool",
-        "mkbootimg",
-        "unpack_bootimg",
-    ],
-    test_suites: [
-        "general-tests",
-    ],
+    test_options: {
+        unit_test: true,
+    },
 }