From e85baf47c2ed2bbbc80c494177186a95465dae0b Mon Sep 17 00:00:00 2001
From: Victor Hsieh <victorhsieh@google.com>
Date: Tue, 3 Mar 2020 14:13:56 -0800
Subject: [PATCH] Put ApkVerityTest in vts-core

VTS provides rootable environment for ApkVerityTest to run.
ApkVerityTest needs to write block device to verify the failure case of
fs-verity.

Test: see ApkVerityTests and block_device_writer in `unzip -l
      out/host/linux-x86/vts-core/android-vts-core.zip`
Bug: 150641206
Change-Id: Idc71907a28f68fc873c5cac940aa706e0b79843e
---
 tests/ApkVerityTest/Android.bp                     | 2 +-
 tests/ApkVerityTest/block_device_writer/Android.bp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ApkVerityTest/Android.bp b/tests/ApkVerityTest/Android.bp
index c8d1ce1e78376..2482068177407 100644
--- a/tests/ApkVerityTest/Android.bp
+++ b/tests/ApkVerityTest/Android.bp
@@ -16,7 +16,7 @@ java_test_host {
     name: "ApkVerityTest",
     srcs: ["src/**/*.java"],
     libs: ["tradefed", "compatibility-tradefed", "compatibility-host-util"],
-    test_suites: ["general-tests"],
+    test_suites: ["general-tests", "vts-core"],
     target_required: [
         "block_device_writer_module",
     ],
diff --git a/tests/ApkVerityTest/block_device_writer/Android.bp b/tests/ApkVerityTest/block_device_writer/Android.bp
index 78850c5345961..65cb3643259b2 100644
--- a/tests/ApkVerityTest/block_device_writer/Android.bp
+++ b/tests/ApkVerityTest/block_device_writer/Android.bp
@@ -47,6 +47,6 @@ cc_test {
         },
     },
 
-    test_suites: ["general-tests", "pts"],
+    test_suites: ["general-tests", "pts", "vts-core"],
     gtest: false,
 }