Merge "Push prebuilt libvtswidevine to device for drm HAL tests" am:... (4dbe5aa6) · Commits · e / os / android_hardware_interfaces

drm/1.0/vts/functional/Android.bp

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -84,6 +84,20 @@ cc_test {
	"libcrypto_static",		"libcrypto_static",
	"libdrmvtshelper",		"libdrmvtshelper",
	],		],
			arch: {
			arm: {
			data: [":libvtswidevine-arm-prebuilts"],
			},
			arm64: {
			data: [":libvtswidevine-arm64-prebuilts"],
			},
			x86: {
			data: [":libvtswidevine-x86-prebuilts"],
			},
			x86_64: {
			data: [":libvtswidevine-x86_64-prebuilts"],
			},
			},
	test_suites: [		test_suites: [
	"general-tests",		"general-tests",
	"vts-core",		"vts-core",

drm/1.0/vts/functional/AndroidTest.xml

0 → 100644

+33 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2020 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="Runs VtsHalDrmV1_0TargetTest.">
			<option name="test-suite-tag" value="apct" />
			<option name="test-suite-tag" value="apct-native" />

			<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

			<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
			<option name="cleanup" value="true" />
			<option name="push-file" key="VtsHalDrmV1_0TargetTest" value="/data/local/tmp/VtsHalDrmV1_0TargetTest" />
			<option name="push-file" key="libvtswidevine64.so" value="/data/local/tmp/64/lib/libvtswidevine.so" />
			<option name="push-file" key="libvtswidevine32.so" value="/data/local/tmp/32/lib/libvtswidevine.so" />
			</target_preparer>

			<test class="com.android.tradefed.testtype.GTest" >
			<option name="native-test-device-path" value="/data/local/tmp" />
			<option name="module-name" value="VtsHalDrmV1_0TargetTest" />
			</test>
			</configuration>

drm/1.1/vts/functional/Android.bp

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,11 +60,25 @@ cc_test {
	"drm_hal_test_main.cpp",		"drm_hal_test_main.cpp",
	],		],
	whole_static_libs: [		whole_static_libs: [
	"android.hardware.drm@1.1-vts"		"android.hardware.drm@1.1-vts",
	],		],
	shared_libs: [		shared_libs: [
	"android.hardware.drm@1.1",		"android.hardware.drm@1.1",
	],		],
			arch: {
			arm: {
			data: [":libvtswidevine-arm-prebuilts"],
			},
			arm64: {
			data: [":libvtswidevine-arm64-prebuilts"],
			},
			x86: {
			data: [":libvtswidevine-x86-prebuilts"],
			},
			x86_64: {
			data: [":libvtswidevine-x86_64-prebuilts"],
			},
			},
	test_suites: [		test_suites: [
	"general-tests",		"general-tests",
	"vts-core",		"vts-core",

drm/1.1/vts/functional/AndroidTest.xml

0 → 100644

+33 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2020 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="Runs VtsHalDrmV1_1TargetTest.">
			<option name="test-suite-tag" value="apct" />
			<option name="test-suite-tag" value="apct-native" />

			<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

			<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
			<option name="cleanup" value="true" />
			<option name="push-file" key="VtsHalDrmV1_1TargetTest" value="/data/local/tmp/VtsHalDrmV1_1TargetTest" />
			<option name="push-file" key="libvtswidevine64.so" value="/data/local/tmp/64/lib/libvtswidevine.so" />
			<option name="push-file" key="libvtswidevine32.so" value="/data/local/tmp/32/lib/libvtswidevine.so" />
			</target_preparer>

			<test class="com.android.tradefed.testtype.GTest" >
			<option name="native-test-device-path" value="/data/local/tmp" />
			<option name="module-name" value="VtsHalDrmV1_1TargetTest" />
			</test>
			</configuration>

drm/1.2/vts/functional/Android.bp

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,20 @@ cc_test {
	"libcrypto_static",		"libcrypto_static",
	"libdrmvtshelper",		"libdrmvtshelper",
	],		],
			arch: {
			arm: {
			data: [":libvtswidevine-arm-prebuilts"],
			},
			arm64: {
			data: [":libvtswidevine-arm64-prebuilts"],
			},
			x86: {
			data: [":libvtswidevine-x86-prebuilts"],
			},
			x86_64: {
			data: [":libvtswidevine-x86_64-prebuilts"],
			},
			},
	test_suites: [		test_suites: [
	"general-tests",		"general-tests",
	"vts-core",		"vts-core",