Merge "Tv Input Hal VTS test." (786b858a) · Commits · e / os / android_hardware_interfaces

tv/input/1.0/Android.bp

+64 −0

Original line number	Diff line number	Diff line
		@@ -64,3 +64,67 @@ cc_library_shared {
		"android.hidl.base@1.0",
		],
		}

		genrule {
		name: "android.hardware.tv.input.vts.driver@1.0_genc++",
		tools: ["hidl-gen", "vtsc"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
		srcs: [
		"types.hal",
		"ITvInput.hal",
		"ITvInputCallback.hal",
		],
		out: [
		"android/hardware/tv/input/1.0/types.vts.cpp",
		"android/hardware/tv/input/1.0/TvInput.vts.cpp",
		"android/hardware/tv/input/1.0/TvInputCallback.vts.cpp",
		],
		}

		genrule {
		name: "android.hardware.tv.input.vts.driver@1.0_genc++_headers",
		tools: ["hidl-gen", "vtsc"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
		srcs: [
		"types.hal",
		"ITvInput.hal",
		"ITvInputCallback.hal",
		],
		out: [
		"android/hardware/tv/input/1.0/types.vts.h",
		"android/hardware/tv/input/1.0/TvInput.vts.h",
		"android/hardware/tv/input/1.0/TvInputCallback.vts.h",
		],
		}

		cc_library_shared {
		name: "android.hardware.tv.input.vts.driver@1.0",
		generated_sources: ["android.hardware.tv.input.vts.driver@1.0_genc++"],
		generated_headers: ["android.hardware.tv.input.vts.driver@1.0_genc++_headers"],
		export_generated_headers: ["android.hardware.tv.input.vts.driver@1.0_genc++_headers"],
		shared_libs: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"liblog",
		"libutils",
		"libcutils",
		"libvts_common",
		"libvts_datatype",
		"libvts_measurement",
		"libvts_multidevice_proto",
		"libcamera_metadata",
		"libprotobuf-cpp-full",
		"android.hardware.audio.common@2.0",
		"android.hidl.base@1.0",
		"android.hardware.tv.input@1.0",
		],
		export_shared_lib_headers: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"libutils",
		"android.hardware.audio.common@2.0",
		"android.hidl.base@1.0",
		],
		}

tv/input/1.0/Android.mk

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2016 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.
		#

		LOCAL_PATH := $(call my-dir)

		include $(call all-subdir-makefiles)

tv/input/1.0/vts/Android.mk

+1 −71

Original line number	Diff line number	Diff line
		@@ -16,74 +16,4 @@

		LOCAL_PATH := $(call my-dir)

		# build VTS profiler for TvInput
		include $(CLEAR_VARS)

		LOCAL_MODULE := libvts_profiler_hidl_tv_input@1.0

		LOCAL_SRC_FILES := \
		TvInput.vts \
		types.vts \
		../../../../audio/common/2.0/vts/types.vts \

		LOCAL_C_INCLUDES += \
		test/vts/drivers/libprofiling \

		LOCAL_VTS_MODE := PROFILER

		LOCAL_SHARED_LIBRARIES += \
		android.hardware.tv.input@1.0 \
		libbase \
		libcutils \
		liblog \
		libhidlbase \
		libhidltransport \
		libhwbinder \
		libprotobuf-cpp-full \
		libvts_common \
		libvts_multidevice_proto \
		libvts_profiling \
		libutils \

		LOCAL_PROTOC_OPTIMIZE_TYPE := full

		LOCAL_MULTILIB := both

		include $(BUILD_SHARED_LIBRARY)


		# build VTS profiler for TvInputCallback
		include $(CLEAR_VARS)

		LOCAL_MODULE := libvts_profiler_hidl_tv_input_callback_@1.0

		LOCAL_SRC_FILES := \
		TvInputCallback.vts \
		types.vts \
		../../../../audio/common/2.0/vts/types.vts \

		LOCAL_C_INCLUDES += \
		test/vts/drivers/libprofiling \

		LOCAL_VTS_MODE := PROFILER

		LOCAL_SHARED_LIBRARIES += \
		android.hardware.tv.input@1.0 \
		libbase \
		libcutils \
		liblog \
		libhidlbase \
		libhidltransport \
		libhwbinder \
		libprotobuf-cpp-full \
		libvts_common \
		libvts_multidevice_proto \
		libvts_profiling \
		libutils \

		LOCAL_PROTOC_OPTIMIZE_TYPE := full

		LOCAL_MULTILIB := both

		include $(BUILD_SHARED_LIBRARY)

		include $(LOCAL_PATH)/functional/vts/testcases/hal/tv_input/hidl/host/Android.mk

tv/input/1.0/vts/TvInput.vts

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ interface: {
		predefined_type: "::android::hardware::tv::input::V1_0::Result"
		}
		return_type_hidl: {
		type: TYPE_HANDLE
		}
		arg: {
		type: TYPE_SCALAR

tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/init.py

0 → 100644

+0 −0

Empty file added.