commit d10feeaaad681c9f70330838f5d19e54ecfc98b7
author Zhuoyao Zhang <zhuoyao@google.com> Mon Jan 23 17:29:58 2017 -0800
committer Zhuoyao Zhang <zhuoyao@google.com> Thu Jan 26 11:13:30 2017 -0800
tree b001ec10a6a4dd9a3fd9e66692fad47c9f3dca8b
parent bec74edf84731f67043c60a3baeaba786091d48f

Update hidl-gen for HidlInstrumentor.

* Generate the code to pass the package and interface name to
  HidlInstrumentor

Test: make hidl-gen
      mma for hardware/interface
      run vts -m VibratorHidlTest
Change-Id: Ic370e41b62dc1b81ddb7794682de53e0515f9193

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index aa22362..116bc21 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -793,7 +793,8 @@
     out << "explicit "
         << klassName
         << "(const ::android::sp<" << ifaceName << "> &_hidl_impl,"
-        << " const std::string& prefix);"
+        << " const std::string& HidlInstrumentor_package,"
+        << " const std::string& HidlInstrumentor_interface);"
         << "\n\n";
     out << "::android::status_t onTransact(\n";
     out.indent();
@@ -1330,7 +1331,7 @@
         << ">(_hidl_impl),\n"
         << "  ::android::hardware::HidlInstrumentor(\""
         << mPackage.string()
-        << "::"
+        << "\", \""
         << fqName.getInterfaceName()
         << "\") {\n";
 
@@ -1368,7 +1369,7 @@
     }
 
     out << mPackage.string()
-        << "::"
+        << "\", \""
         << interfaceName
         << "\") { \n";
     out.indent();
@@ -1385,13 +1386,15 @@
         out << klassName
             << "::"
             << klassName
-            << "(const ::android::sp<" << interfaceName <<"> &_hidl_impl,"
-            << " const std::string &prefix)\n";
+            << "(const ::android::sp<" << interfaceName << "> &_hidl_impl,"
+            << " const std::string &HidlInstrumentor_package,"
+            << " const std::string &HidlInstrumentor_interface)\n";
 
         out.indent();
         out.indent();
 
-        out << ": ::android::hardware::HidlInstrumentor(prefix) { \n";
+        out << ": ::android::hardware::HidlInstrumentor("
+            << "HidlInstrumentor_package, HidlInstrumentor_interface) {\n";
         out.indent();
         out << "_hidl_mImpl = _hidl_impl;\n";
         out.unindent();
@@ -1852,7 +1855,9 @@
         << "(const ::android::sp<"
         << iface->fullName()
         << "> impl) : ::android::hardware::HidlInstrumentor(\""
-        << iface->fqName().string()
+        << mPackage.string()
+        << "\", \""
+        << iface->localName()
         << "\"), mImpl(impl) {";
     if (iface->hasOnewayMethods()) {
         out << "\n";