commit ef924bb5cd1b4b8691f92fcbaf00e7e043a86e05
author Hridya Valsaraju <hridya@google.com> Fri Mar 03 14:08:56 2017 -0800
committer Hridya Valsaraju <hridya@google.com> Fri Mar 03 14:12:35 2017 -0800
tree 2133f6b9af52d43bd64e8848fbb4b2624c0a134a
parent 77c8aba447488b2507f9531fa17e80b06c5bb0df

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

Test: built and ran FMQ benchmarks

This reverts commit e1d90c68e4d58f8a7379ac0e7f1e12538e8f922e.

Change-Id: I2926f9f54e047e20cd7fab0140725dc8cb81b135

benchmarks/Android.mk

diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index be81175..0b0b167 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -30,7 +30,7 @@
     libhidlbase \
     libhidltransport
 
-LOCAL_SHARED_LIBRARIES += android.hardware.benchmarks.msgq@1.0 libfmq
+LOCAL_SHARED_LIBRARIES += android.hardware.tests.msgq@1.0 libfmq
 
 LOCAL_MULTILIB := both
 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
@@ -50,7 +50,7 @@
     libhidlbase \
     libhidltransport
 
-LOCAL_SHARED_LIBRARIES += android.hardware.benchmarks.msgq@1.0 libfmq
+LOCAL_SHARED_LIBRARIES += android.hardware.tests.msgq@1.0 libfmq
 LOCAL_MODULE := mq_benchmark_client
 include $(BUILD_NATIVE_TEST)
 

benchmarks/msgq_benchmark_client.cpp

diff --git a/benchmarks/msgq_benchmark_client.cpp b/benchmarks/msgq_benchmark_client.cpp
index 06433cd..bc67c98 100644
--- a/benchmarks/msgq_benchmark_client.cpp
+++ b/benchmarks/msgq_benchmark_client.cpp
@@ -21,7 +21,7 @@
 #include <chrono>
 #include <iostream>
 
-#include <android/hardware/benchmarks/msgq/1.0/IBenchmarkMsgQ.h>
+#include <android/hardware/tests/msgq/1.0/IBenchmarkMsgQ.h>
 #include <fmq/MessageQueue.h>
 
 // libutils:
@@ -30,7 +30,7 @@
 using android::status_t;
 
 // generated
-using android::hardware::benchmarks::msgq::V1_0::IBenchmarkMsgQ;
+using android::hardware::tests::msgq::V1_0::IBenchmarkMsgQ;
 using std::cerr;
 using std::cout;
 using std::endl;
@@ -61,7 +61,7 @@
     kPacketSize1024 = 1024
 };
 
-const char kServiceName[] = "android.hardware.benchmarks.msgq@1.0::IBenchmarkMsgQ";
+const char kServiceName[] = "android.hardware.tests.msgq@1.0::IBenchmarkMsgQ";
 
 class MQTestClient : public ::testing::Test {
 protected:

benchmarks/msgq_benchmark_service.cpp

diff --git a/benchmarks/msgq_benchmark_service.cpp b/benchmarks/msgq_benchmark_service.cpp
index 6548124..edaae60 100644
--- a/benchmarks/msgq_benchmark_service.cpp
+++ b/benchmarks/msgq_benchmark_service.cpp
@@ -21,7 +21,7 @@
 #include <thread>
 
 #include <fmq/MessageQueue.h>
-#include <android/hardware/benchmarks/msgq/1.0/IBenchmarkMsgQ.h>
+#include <android/hardware/tests/msgq/1.0/IBenchmarkMsgQ.h>
 
 // libutils:
 using android::Looper;
@@ -49,7 +49,7 @@
 
 // Generated HIDL files
 
-using android::hardware::benchmarks::msgq::V1_0::IBenchmarkMsgQ;
+using android::hardware::tests::msgq::V1_0::IBenchmarkMsgQ;
 
 /*
  * The various packet sizes used are as follows.
@@ -62,7 +62,7 @@
     kPacketSize1024 = 1024
 };
 
-const char kServiceName[] = "android.hardware.benchmarks.msgq@1.0::IBenchmarkMsgQ";
+const char kServiceName[] = "android.hardware.tests.msgq@1.0::IBenchmarkMsgQ";
 
 namespace {
 /*