commit 4e2e4c93379fbb53f88a09147d17caefdcf850fd
author Victor Hsieh <victorhsieh@google.com> Fri May 06 16:24:09 2022 -0700
committer Victor Hsieh <victorhsieh@google.com> Fri May 06 16:32:23 2022 -0700
tree 3606f5c4c550327cd2742be256f1ed44fe2fa564
parent 253e417e7694b63b89d2f118f2841e5659520227

Revert "Remove workarounds by data_device_bins"

This reverts commit 279bf21281709c3d9e8166bf82f61944faa62ebf.

Manual change:
 * Resolved conflicts in Android.bp to not change "test_suites".
 * bpfmt to silence repo upload warning

Fixes: 229948069
Fixes: 230556754
Test: TH
Change-Id: Iecccae4008c6fefd3f6ab47fb5e37ca4b22090be

tests/ApkVerityTest/Android.bp

diff --git a/tests/ApkVerityTest/Android.bp b/tests/ApkVerityTest/Android.bp
index d4fa1dd..62e16a5 100644
--- a/tests/ApkVerityTest/Android.bp
+++ b/tests/ApkVerityTest/Android.bp
@@ -37,8 +37,8 @@
         "general-tests",
         "vts",
     ],
-    data_device_bins: [
-        "block_device_writer",
+    target_required: [
+        "block_device_writer_module",
     ],
     data: [
         ":ApkVerityTestCertDer",