commit 768504755e40b0bf5e01b0e3fd74e2b40e72593d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 20 05:45:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 20 05:45:09 2021 +0000
tree 5ce1359eb2ae288fb68b73ab8662c648e5461690
parent a92d831f8eeb52704ac85c36b05b33bfd0e07ccc
parent 0691fd1fefbd9655aeb2fc8ef816a3077ede29f5

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: Iafaa957a7065b090e490485c19f6a1e8ec4217ee

Android.bp

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