From 64d2e418b6b4a036301950427563250007f2ff4c Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Tue, 11 Apr 2023 16:20:11 +0900
Subject: [PATCH] Explicitly include MicrodroidTestPreparer in the test module

This would be a workaround until sandboxed test environment
properly prepares indirect dependencies.

Bug: 277655002, Bug: 262397555
Test: N/A
Change-Id: I118065f27ab5e730afc6b0cf8ee82554c1c0b54b
---
 authfs/tests/benchmarks/Android.bp | 1 +
 tests/hostside/Android.bp          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/authfs/tests/benchmarks/Android.bp b/authfs/tests/benchmarks/Android.bp
index b30ecdd3..110d000e 100644
--- a/authfs/tests/benchmarks/Android.bp
+++ b/authfs/tests/benchmarks/Android.bp
@@ -12,6 +12,7 @@ java_test_host {
         "AuthFsHostTestCommon",
         "MicrodroidHostTestHelper",
         "cts-host-utils",
+        "MicrodroidTestPreparer", // Workaround for sandboxed test environment to install this
     ],
     test_suites: ["general-tests"],
     data_device_bins_first: [
diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index c71a8eca..873cc389 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -38,6 +38,7 @@ java_test_host {
         "compatibility-host-util",
         "cts-statsd-atom-host-test-utils",
         "microdroid_payload_metadata",
+        "MicrodroidTestPreparer", // Workaround for sandboxed test environment to install this
     ],
     per_testcase_directory: true,
     data: [