Merge "Update PackageSignatureTest and ApexSignatureVerificationTest" into udc-dev am: 433a370 am: 90b213c

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/25202036

Change-Id: I2982c0485a20ec330e7841bfe6eaeb83b5aeb8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Author: nioffe

hostsidetests/appsecurity/Android.bp

@@ -167,3 +167,40 @@ filegroup {
     name: "CtsHostsideTestsAppSecurityUtil",
     srcs: ["src/android/appsecurity/cts/Utils.java"],
 }
+
+// The ApexSignatureVerificationTest is split into a separate java_test_host
+// to make it possible to run this test as part of GTS as well.
+// See b/301094654
+java_test_host {
+    name: "GtsApexSignatureVerificationTest",
+    defaults: ["cts_defaults"],
+
+    srcs: [
+        "src/android/appsecurity/cts/ApexSignatureVerificationTest.java",
+    ],
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "compatibility-host-util",
+        "truth-prebuilt",
+        "hamcrest-library",
+    ],
+
+    static_libs: [
+        "CompatChangeGatingTestBase",
+        "CtsPkgInstallerConstants",
+        "cts-host-utils",
+        "cts-statsd-atom-host-test-utils",
+        "sts-host-util",
+    ],
+
+    java_resource_dirs: ["res"],
+
+    // tag this module as a cts test artifact
+    test_suites: [
+        "general-tests",
+        "gts",
+    ],
+    per_testcase_directory: true,
+    test_config: "AndroidTest_ApexSignatureVerificationTest.xml",
+}

hostsidetests/appsecurity/AndroidTest_ApexSignatureVerificationTest.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Config for the GtsApexSignatureVerificationTest">
+    <option name="test-suite-tag" value="gts" />
+    <option name="config-descriptor:metadata" key="component" value="packagemanager" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <target_preparer class="android.appsecurity.cts.AppSecurityPreparer" />
+    <!-- disable DeprecatedAbi warning -->
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
+    </target_preparer>
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="GtsApexSignatureVerificationTest.jar" />
+    </test>
+</configuration>