From c84d102307822e448cbf9ae1db15091d3cff38d9 Mon Sep 17 00:00:00 2001
From: Victor Hsieh <victorhsieh@google.com>
Date: Tue, 10 Dec 2019 16:07:44 -0800
Subject: [PATCH] Rename ApkVerityTests to ApkVerityTest for consistency

This also makes TEST_MAPPING work.

Test: atest com.android.apkverity.ApkVerityTest
Test: atest -p frameworks/base/tests/ApkVerityTest:presubmit
Bug: 112039386
Change-Id: I721285770208b2a1b18ead2fa34c43e9e8bc0c46
---
 tests/ApkVerityTest/Android.bp      | 2 +-
 tests/ApkVerityTest/AndroidTest.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ApkVerityTest/Android.bp b/tests/ApkVerityTest/Android.bp
index adcbb4287dd08..9bb9983f66a97 100644
--- a/tests/ApkVerityTest/Android.bp
+++ b/tests/ApkVerityTest/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 java_test_host {
-    name: "ApkVerityTests",
+    name: "ApkVerityTest",
     srcs: ["src/**/*.java"],
     libs: ["tradefed", "compatibility-tradefed", "compatibility-host-util"],
     test_suites: ["general-tests"],
diff --git a/tests/ApkVerityTest/AndroidTest.xml b/tests/ApkVerityTest/AndroidTest.xml
index 73779cbd1a879..51bcdea21f49a 100644
--- a/tests/ApkVerityTest/AndroidTest.xml
+++ b/tests/ApkVerityTest/AndroidTest.xml
@@ -36,6 +36,6 @@
     </target_preparer>
 
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
-        <option name="jar" value="ApkVerityTests.jar" />
+        <option name="jar" value="ApkVerityTest.jar" />
     </test>
 </configuration>