Merge "Revert "Revert "Move android.hardware.benchmarks into android.hardware.tests"""

This commit is contained in:
Hridya Valsaraju
2017-03-06 21:21:17 +00:00
committed by Gerrit Code Review
4 changed files with 8 additions and 64 deletions

View File

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

View File

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

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

View File

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