commit 2cbbdf9824fb62fe59751427b58411ac6a03a3a1
author Yifan Hong <elsk@google.com> Mon Dec 05 15:20:50 2016 -0800
committer Yifan Hong <elsk@google.com> Fri Dec 09 11:31:18 2016 -0800
tree ecad0ff5d4e4244eb01db456d84420bd2a66bc22
parent 4b0214d0fdeb1aeb63aba0c8a17ba031fb7d6fcf

Move dependency of ServiceManagement from IFoo to FooAll.

defaultServiceManager() lives in libhidltransport, so
IFoo should not depend on it. Because only FooAll.cpp
which uses IMPLEMENT_SERVICE_MANAGER_INTERACTIONS()
uses it, it is included there instead.

Bug: 32756130

Test: hidl_test
Change-Id: I7661c31913027d375c63166ba55a5319a14a2f30

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index 4d7a444..0306385 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -174,7 +174,6 @@
     out << "#include <hidl/MQDescriptor.h>\n";
 
     if (isInterface) {
-        out << "#include <hidl/ServiceManagement.h>\n";
         out << "#include <hidl/Status.h>\n";
     }
 
@@ -813,6 +812,8 @@
                                       superType->fqName(),
                                       "Bp" + superType->getBaseName());
         }
+
+        out << "#include <hidl/ServiceManagement.h>\n";
     } else {
         generateCppPackageInclude(out, mPackage, "types");
         generateCppPackageInclude(out, mPackage, "hwtypes");