Merge "Reimplement ApkVerityTest" into main (cc39b82f) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/TEST_MAPPING

+0 −3

Original line number	Diff line number	Diff line
		@@ -47,9 +47,6 @@
		{
		"name":"CarrierAppIntegrationTestCases"
		},
		{
		"name":"ApkVerityTest"
		},
		{
		"name":"CtsSilentUpdateHostTestCases"
		},

core/java/com/android/internal/security/TEST_MAPPING

+6 −4

Original line number	Diff line number	Diff line
		@@ -11,10 +11,6 @@
		}
		]
		},
		{
		"name": "ApkVerityTest",
		"file_patterns": ["VerityUtils\\.java"]
		},
		{
		"name": "UpdatableSystemFontTest",
		"file_patterns": ["VerityUtils\\.java"]
		@@ -23,5 +19,11 @@
		"name": "CtsApkVerityInstallHostTestCases",
		"file_patterns": ["VerityUtils\\.java"]
		}
		],
		"postsubmit": [
		{
		"name": "FsVerityTest",
		"file_patterns": ["VerityUtils\\.java"]
		}
		]
		}

tests/ApkVerityTest/Android.bp

+4 −10

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ package {
		}

		java_test_host {
		name: "ApkVerityTest",
		name: "FsVerityTest",
		srcs: ["src/*/.java"],
		libs: [
		"tradefed",
		@@ -30,8 +30,10 @@ java_test_host {
		"compatibility-host-util",
		],
		static_libs: [
		"android.security.flags-aconfig-java-host",
		"block_device_writer_jar",
		"frameworks-base-hostutils",
		"flag-junit-host",
		],
		test_suites: [
		"general-tests",
		@@ -41,14 +43,6 @@ java_test_host {
		"block_device_writer",
		],
		data: [
		":ApkVerityTestCertDer",
		":ApkVerityTestApp",
		":ApkVerityTestAppFsvSig",
		":ApkVerityTestAppDm",
		":ApkVerityTestAppDmFsvSig",
		":ApkVerityTestAppSplit",
		":ApkVerityTestAppSplitFsvSig",
		":ApkVerityTestAppSplitDm",
		":ApkVerityTestAppSplitDmFsvSig",
		":FsVerityTestApp",
		],
		}

tests/ApkVerityTest/AndroidTest.xml

+5 −17

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<configuration description="APK fs-verity integration/regression test">
		<configuration description="fs-verity end-to-end test">
		<option name="test-suite-tag" value="apct" />

		<object type="module_controller" class="com.android.tradefed.testtype.suite.module.ShippingApiLevelModuleController">
		@@ -24,19 +24,9 @@
		<!-- This test requires root to write against block device. -->
		<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

		<target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
		<!-- Disable package verifier prevents it holding the target APK's fd that prevents cache
		eviction. -->
		<option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
		<option name="restore-settings" value="true" />

		<!-- Skip in order to prevent reboot that confuses the test flow. -->
		<option name="force-skip-system-props" value="true" />
		</target_preparer>

		<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
		<option name="cleanup" value="true" />
		<option name="push" value="ApkVerityTestCert.der->/data/local/tmp/ApkVerityTestCert.der" />
		<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
		<option name="test-file-name" value="FsVerityTestApp.apk"/>
		<option name="cleanup-apks" value="true"/>
		</target_preparer>

		<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
		@@ -48,9 +38,7 @@
		<option name="push" value="block_device_writer->/data/local/tmp/block_device_writer" />
		</target_preparer>

		<!-- Skip on HWASan. TODO(b/232288278): Re-enable -->
		<object type="module_controller" class="com.android.tradefed.testtype.suite.module.SkipHWASanModuleController" />
		<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
		<option name="jar" value="ApkVerityTest.jar" />
		<option name="jar" value="FsVerityTest.jar" />
		</test>
		</configuration>

tests/ApkVerityTest/ApkVerityTestApp/feature_split/AndroidManifest.xml

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		* Copyright (C) 2019 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.
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.apkverity"
		android:isFeatureSplit="true"
		split="feature_x">
		<application>
		<activity android:name=".feature_x.DummyActivity"/>
		</application>
		</manifest>