Revert "Revert "Move android.hardware.benchmarks into android.hardware.tests"" (00478098) · Commits · e / os / android_hardware_interfaces

benchmarks/Android.bp

deleted100644 → 0

+0 −4

Original line number	Original line	Diff line number	Diff line
	// This is an autogenerated file, do not edit.
	subdirs = [
	"msgq/1.0",
	]

benchmarks/msgq/1.0/Android.bp

deleted100644 → 0

+0 −59

Original line number	Original line	Diff line number	Diff line
	// This file is autogenerated by hidl-gen. Do not edit manually.

	filegroup {
	name: "android.hardware.benchmarks.msgq@1.0_hal",
	srcs: [
	"IBenchmarkMsgQ.hal",
	],
	}

	genrule {
	name: "android.hardware.benchmarks.msgq@1.0_genc++",
	tools: ["hidl-gen"],
	cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0",
	srcs: [
	":android.hardware.benchmarks.msgq@1.0_hal",
	],
	out: [
	"android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQAll.cpp",
	],
	}

	genrule {
	name: "android.hardware.benchmarks.msgq@1.0_genc++_headers",
	tools: ["hidl-gen"],
	cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0",
	srcs: [
	":android.hardware.benchmarks.msgq@1.0_hal",
	],
	out: [
	"android/hardware/benchmarks/msgq/1.0/IBenchmarkMsgQ.h",
	"android/hardware/benchmarks/msgq/1.0/IHwBenchmarkMsgQ.h",
	"android/hardware/benchmarks/msgq/1.0/BnHwBenchmarkMsgQ.h",
	"android/hardware/benchmarks/msgq/1.0/BpHwBenchmarkMsgQ.h",
	"android/hardware/benchmarks/msgq/1.0/BsBenchmarkMsgQ.h",
	],
	}

	cc_library_shared {
	name: "android.hardware.benchmarks.msgq@1.0",
	generated_sources: ["android.hardware.benchmarks.msgq@1.0_genc++"],
	generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],
	export_generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],
	shared_libs: [
	"libhidlbase",
	"libhidltransport",
	"libhwbinder",
	"liblog",
	"libutils",
	"libcutils",
	"android.hidl.base@1.0",
	],
	export_shared_lib_headers: [
	"libhidlbase",
	"libhidltransport",
	"libhwbinder",
	"libutils",
	"android.hidl.base@1.0",
	],
	}

tests/msgq/1.0/Android.bp

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,7 @@
	filegroup {		filegroup {
	name: "android.hardware.tests.msgq@1.0_hal",		name: "android.hardware.tests.msgq@1.0_hal",
	srcs: [		srcs: [
			"IBenchmarkMsgQ.hal",
	"ITestMsgQ.hal",		"ITestMsgQ.hal",
	],		],
	}		}
	@@ -15,6 +16,7 @@ genrule {
	":android.hardware.tests.msgq@1.0_hal",		":android.hardware.tests.msgq@1.0_hal",
	],		],
	out: [		out: [
			"android/hardware/tests/msgq/1.0/BenchmarkMsgQAll.cpp",
	"android/hardware/tests/msgq/1.0/TestMsgQAll.cpp",		"android/hardware/tests/msgq/1.0/TestMsgQAll.cpp",
	],		],
	}		}
	@@ -27,6 +29,11 @@ genrule {
	":android.hardware.tests.msgq@1.0_hal",		":android.hardware.tests.msgq@1.0_hal",
	],		],
	out: [		out: [
			"android/hardware/tests/msgq/1.0/IBenchmarkMsgQ.h",
			"android/hardware/tests/msgq/1.0/IHwBenchmarkMsgQ.h",
			"android/hardware/tests/msgq/1.0/BnHwBenchmarkMsgQ.h",
			"android/hardware/tests/msgq/1.0/BpHwBenchmarkMsgQ.h",
			"android/hardware/tests/msgq/1.0/BsBenchmarkMsgQ.h",
	"android/hardware/tests/msgq/1.0/ITestMsgQ.h",		"android/hardware/tests/msgq/1.0/ITestMsgQ.h",
	"android/hardware/tests/msgq/1.0/IHwTestMsgQ.h",		"android/hardware/tests/msgq/1.0/IHwTestMsgQ.h",
	"android/hardware/tests/msgq/1.0/BnHwTestMsgQ.h",		"android/hardware/tests/msgq/1.0/BnHwTestMsgQ.h",

benchmarks/msgq/1.0/IBenchmarkMsgQ.hal→tests/msgq/1.0/IBenchmarkMsgQ.hal

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package android.hardware.benchmarks.msgq@1.0;		package android.hardware.tests.msgq@1.0;

	interface IBenchmarkMsgQ {		interface IBenchmarkMsgQ {
	/*		/*