Merge "Add vts tests to verify DRM AIDL interface" (173d73af) · Commits · e / os / android_hardware_interfaces

drm/1.0/vts/functional/Android.bp

+9 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,14 @@ package {
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		cc_library_headers {
		name: "drm_hal_vendor_module_headers",
		vendor_available: true,
		export_include_dirs: [
		"include",
		],
		}

		cc_library_static {
		name: "libdrmvtshelper",
		defaults: ["VtsHalTargetTestDefaults"],
		@@ -36,6 +44,7 @@ cc_library_static {
		"android.hardware.drm@1.0-helper",
		],
		export_include_dirs: ["include"],
		export_static_lib_headers: ["android.hardware.drm@1.0-helper"],
		}

		cc_library_static {

drm/1.2/vts/functional/Android.bp

+13 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,19 @@ package {
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		cc_library_static {
		name: "libvtsclearkey",
		srcs: [
		"drm_hal_clearkey_module.cpp",
		],
		static_libs: [
		"libgtest",
		],
		header_libs: ["drm_hal_vendor_module_headers"],
		export_header_lib_headers: ["drm_hal_vendor_module_headers"],
		export_include_dirs: ["."],
		}

		cc_library_static {
		name: "android.hardware.drm@1.2-vts",
		defaults: ["VtsHalTargetTestDefaults"],

drm/aidl/vts/Android.bp

0 → 100644

+73 −0

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2021 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.
		//
		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "hardware_interfaces_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		cc_test {
		name: "VtsAidlHalDrmTargetTest",
		defaults: [
		"VtsHalTargetTestDefaults",
		"use_libaidlvintf_gtest_helper_static",
		],
		srcs: [
		"drm_hal_common.cpp",
		"drm_hal_test.cpp",
		"drm_hal_test_main.cpp",
		],
		local_include_dirs: [
		"include",
		],
		header_libs: [
		"drm_hal_vendor_module_headers",
		],
		shared_libs: [
		"libandroid",
		"libbinder_ndk",
		"libcrypto",
		"libnativehelper",
		],
		static_libs: [
		"android.hardware.drm@1.0-helper",
		"android.hardware.drm-V1-ndk",
		"android.hardware.common-V2-ndk",
		"libdrmvtshelper",
		"libvtsclearkey",
		],
		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: [
		"general-tests",
		"vts",
		],
		}

drm/aidl/vts/AndroidTest.xml

0 → 100644

+38 −0

Original line number	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 VtsAidlHalDrmTargetTest.">
		<option name="test-suite-tag" value="apct" />
		<option name="test-suite-tag" value="apct-native" />
		<option name="not-shardable" value="true" />

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

		<target_preparer class="com.android.tradefed.targetprep.WifiPreparer" >
		<option name="verify-only" value="true" />
		</target_preparer>

		<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
		<option name="cleanup" value="true" />
		<option name="push-file" key="VtsAidlHalDrmTargetTest" value="/data/local/tmp/VtsAidlHalDrmTargetTest" />
		<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="VtsAidlHalDrmTargetTest" />
		</test>
		</configuration>

drm/aidl/vts/OWNERS

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		edwinwong@google.com
		jtinker@google.com
		kelzhan@google.com
		robertshih@google.com