Merge "Revert "Move android.hardware.benchmarks into android.hardware.tests"" am: b59f873ab9

am: 19de6f7815

Change-Id: I1cc467152a0308b877a261a89480eef6e09e38cf
This commit is contained in:
Greg Hartman
2017-03-02 23:44:52 +00:00
committed by android-build-merger
4 changed files with 64 additions and 8 deletions

4
benchmarks/Android.bp Normal file
View File

@@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"msgq/1.0",
]

View File

@@ -0,0 +1,59 @@
// 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",
],
}

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.tests.msgq@1.0;
package android.hardware.benchmarks.msgq@1.0;
interface IBenchmarkMsgQ {
/*

View File

@@ -3,7 +3,6 @@
filegroup {
name: "android.hardware.tests.msgq@1.0_hal",
srcs: [
"IBenchmarkMsgQ.hal",
"ITestMsgQ.hal",
],
}
@@ -16,7 +15,6 @@ genrule {
":android.hardware.tests.msgq@1.0_hal",
],
out: [
"android/hardware/tests/msgq/1.0/BenchmarkMsgQAll.cpp",
"android/hardware/tests/msgq/1.0/TestMsgQAll.cpp",
],
}
@@ -29,11 +27,6 @@ genrule {
":android.hardware.tests.msgq@1.0_hal",
],
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/IHwTestMsgQ.h",
"android/hardware/tests/msgq/1.0/BnHwTestMsgQ.h",