commit 3b6c701cc7b0ed470bbd32d2173de5d56d546a89
author Victor Hsieh <victorhsieh@google.com> Thu Jun 23 09:52:54 2022 -0700
committer Victor Hsieh <victorhsieh@google.com> Mon Jun 27 15:55:32 2022 -0700
tree a1ef8222a9e2006aeffe0ebe2988ff4c64c09416
parent 5f1ff7d2ec2369668f283e9b9b503025d7650d8b

Reland: Remove workarounds by data_device_bins

This reverts commit 4e2e4c93379fbb53f88a09147d17caefdcf850fd, plus
replacing data_device_bins with data_device_bins_first.

Previously, the test has dirty hacks that force building the device
executable in correct name. Swicth to the proper solution now that we
have it.

Bug: 228775576
Test: atest ApkVerityTest
Test: lunch cf_x86_64_tv-eng; atest ApkVerityTest (against cf_x86_tv VM)
Change-Id: Iccb457131d74a83b9f5cb8457833d7c5ea495b05

tests/ApkVerityTest/Android.bp

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