commit e1d90c68e4d58f8a7379ac0e7f1e12538e8f922e
author Michael Rosenfeld <mrosenfeld@google.com> Thu Mar 02 22:28:44 2017 +0000
committer Michael Rosenfeld <mrosenfeld@google.com> Thu Mar 02 22:28:44 2017 +0000
tree 1dc452a8090c231b75d445ffe0bf127a85dba244
parent 9e7822fd2e166472721e81d05827f7c19120e858

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

This reverts commit 9e7822fd2e166472721e81d05827f7c19120e858.

Change-Id: I75a19226b54397c728361166a6fc178fb486b0be

benchmarks/Android.mk

diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 0b0b167..be81175 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -30,7 +30,7 @@
     libhidlbase \
     libhidltransport
 
-LOCAL_SHARED_LIBRARIES += android.hardware.tests.msgq@1.0 libfmq
+LOCAL_SHARED_LIBRARIES += android.hardware.benchmarks.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.tests.msgq@1.0 libfmq
+LOCAL_SHARED_LIBRARIES += android.hardware.benchmarks.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 bc67c98..06433cd 100644
--- a/benchmarks/msgq_benchmark_client.cpp
+++ b/benchmarks/msgq_benchmark_client.cpp
@@ -21,7 +21,7 @@
 #include <chrono>
 #include <iostream>
 
-#include <android/hardware/tests/msgq/1.0/IBenchmarkMsgQ.h>
+#include <android/hardware/benchmarks/msgq/1.0/IBenchmarkMsgQ.h>
 #include <fmq/MessageQueue.h>
 
 // libutils:
@@ -30,7 +30,7 @@
 using android::status_t;
 
 // generated
-using android::hardware::tests::msgq::V1_0::IBenchmarkMsgQ;
+using android::hardware::benchmarks::msgq::V1_0::IBenchmarkMsgQ;
 using std::cerr;
 using std::cout;
 using std::endl;
@@ -61,7 +61,7 @@
     kPacketSize1024 = 1024
 };
 
-const char kServiceName[] = "android.hardware.tests.msgq@1.0::IBenchmarkMsgQ";
+const char kServiceName[] = "android.hardware.benchmarks.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 edaae60..6548124 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/tests/msgq/1.0/IBenchmarkMsgQ.h>
+#include <android/hardware/benchmarks/msgq/1.0/IBenchmarkMsgQ.h>
 
 // libutils:
 using android::Looper;
@@ -49,7 +49,7 @@
 
 // Generated HIDL files
 
-using android::hardware::tests::msgq::V1_0::IBenchmarkMsgQ;
+using android::hardware::benchmarks::msgq::V1_0::IBenchmarkMsgQ;
 
 /*
  * The various packet sizes used are as follows.
@@ -62,7 +62,7 @@
     kPacketSize1024 = 1024
 };
 
-const char kServiceName[] = "android.hardware.tests.msgq@1.0::IBenchmarkMsgQ";
+const char kServiceName[] = "android.hardware.benchmarks.msgq@1.0::IBenchmarkMsgQ";
 
 namespace {
 /*