Merge "Add IScheduleTest for VTS libhwbinder scheduler test" into oc-dev am: fdd891393c (08a34cbf) · Commits · e / os / android_hardware_interfaces

tests/libhwbinder/1.0/Android.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ filegroup {
		name: "android.hardware.tests.libhwbinder@1.0_hal",
		srcs: [
		"IBenchmark.hal",
		"IScheduleTest.hal",
		],
		}

		@@ -16,6 +17,7 @@ genrule {
		],
		out: [
		"android/hardware/tests/libhwbinder/1.0/BenchmarkAll.cpp",
		"android/hardware/tests/libhwbinder/1.0/ScheduleTestAll.cpp",
		],
		}

		@@ -32,6 +34,11 @@ genrule {
		"android/hardware/tests/libhwbinder/1.0/BnHwBenchmark.h",
		"android/hardware/tests/libhwbinder/1.0/BpHwBenchmark.h",
		"android/hardware/tests/libhwbinder/1.0/BsBenchmark.h",
		"android/hardware/tests/libhwbinder/1.0/IScheduleTest.h",
		"android/hardware/tests/libhwbinder/1.0/IHwScheduleTest.h",
		"android/hardware/tests/libhwbinder/1.0/BnHwScheduleTest.h",
		"android/hardware/tests/libhwbinder/1.0/BpHwScheduleTest.h",
		"android/hardware/tests/libhwbinder/1.0/BsScheduleTest.h",
		],
		}

tests/libhwbinder/1.0/Android.mk

+38 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,25 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
		$(GEN): $(LOCAL_PATH)/IBenchmark.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build IScheduleTest.hal
		#
		GEN := $(intermediates)/android/hardware/tests/libhwbinder/V1_0/IScheduleTest.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IScheduleTest.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava \
		-randroid.hardware:hardware/interfaces \
		-randroid.hidl:system/libhidl/transport \
		android.hardware.tests.libhwbinder@1.0::IScheduleTest

		$(GEN): $(LOCAL_PATH)/IScheduleTest.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)
		include $(BUILD_JAVA_LIBRARY)


		@@ -69,6 +88,25 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
		$(GEN): $(LOCAL_PATH)/IBenchmark.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build IScheduleTest.hal
		#
		GEN := $(intermediates)/android/hardware/tests/libhwbinder/V1_0/IScheduleTest.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IScheduleTest.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava \
		-randroid.hardware:hardware/interfaces \
		-randroid.hidl:system/libhidl/transport \
		android.hardware.tests.libhwbinder@1.0::IScheduleTest

		$(GEN): $(LOCAL_PATH)/IScheduleTest.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)
		include $(BUILD_STATIC_JAVA_LIBRARY)

tests/libhwbinder/1.0/IBenchmark.hal

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,5 +17,5 @@
		package android.hardware.tests.libhwbinder@1.0;

		interface IBenchmark {
		sendVec(vec<uint8_t> data) generates (vec<uint8_t> return_data);
		sendVec(vec<uint8_t> data) generates (vec<uint8_t> data);
		};

tests/libhwbinder/1.0/IScheduleTest.hal

0 → 100644

+21 −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.
		*/

		package android.hardware.tests.libhwbinder@1.0;

		interface IScheduleTest {
		send(uint32_t cfg, uint32_t callerSta) generates (uint32_t data);
		};

tests/libhwbinder/1.0/default/Android.bp

+2 −4

Original line number	Diff line number	Diff line
		cc_library_shared {
		name: "android.hardware.tests.libhwbinder@1.0-impl",
		defaults: ["hidl_defaults"],
		relative_install_path: "hw",
		proprietary: true,
		srcs: [
		"Benchmark.cpp",
		"ScheduleTest.cpp",
		],

		shared_libs: [
		"libbase",
		"libhidlbase",
		"libhidltransport",
		"liblog",
		"libutils",
		"android.hardware.tests.libhwbinder@1.0",
		"android.hidl.base@1.0",
		],
		}