commit 8f2e579b05110ffff979b8422efab4080f2e6b6e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 01 01:30:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 01 01:30:42 2017 +0000
tree 21357bdea51f598c02309cdba7c1f4c1baa49bc9
parent 98ca32ffe7f708d56c78fb70f34432587a773ef7
parent 1a52e8237d6f5ea95d7b11c227f41310d8e4dcaf

Merge "Emit tags for interfaces."

AST.h

diff --git a/AST.h b/AST.h
index dc39c79..10fa156 100644
--- a/AST.h
+++ b/AST.h
@@ -190,6 +190,7 @@
     using MethodGenerator = std::function<status_t(const Method *, const Interface *)>;
 
     void generateTemplatizationLink(Formatter& out) const;
+    void generateCppTag(Formatter& out, const std::string& tag) const;
 
     status_t generateMethods(Formatter &out, MethodGenerator gen) const;
     status_t generateStubImplMethod(Formatter &out,

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index c6b3db7..d53dd67 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -467,6 +467,7 @@
 
         out.indent();
 
+        generateCppTag(out, "android::hardware::details::i_tag");
     }
 
     status_t err = emitTypeDeclarations(out);
@@ -831,6 +832,10 @@
     out << "typedef " << mRootScope.getInterface()->localName() << " Pure;\n\n";
 }
 
+void AST::generateCppTag(Formatter& out, const std::string& tag) const {
+    out << "typedef " << tag << " _hidl_tag;\n\n";
+}
+
 status_t AST::generateStubHeader(const std::string &outputPath) const {
     if (!AST::isInterface()) {
         // types.hal does not get a stub header.
@@ -861,6 +866,7 @@
     out << "#define " << guard << "\n\n";
 
     generateCppPackageInclude(out, mPackage, iface->getHwName());
+
     out << "\n";
 
     enterLeaveNamespace(out, true /* enter */);
@@ -902,6 +908,7 @@
 
     out.endl();
     generateTemplatizationLink(out);
+    generateCppTag(out, "android::hardware::details::bnhw_tag");
 
     out << "::android::sp<" << iface->localName() << "> getImpl() { return _hidl_mImpl; };\n";
     out.unindent();
@@ -994,6 +1001,7 @@
         << "\n\n";
 
     generateTemplatizationLink(out);
+    generateCppTag(out, "android::hardware::details::bphw_tag");
 
     out << "virtual bool isRemote() const override { return true; }\n\n";
 
@@ -1892,6 +1900,7 @@
 
     out.endl();
     generateTemplatizationLink(out);
+    generateCppTag(out, "android::hardware::details::bs_tag");
 
     status_t err = generateMethods(out, [&](const Method *method, const Interface *) {
         return generatePassthroughMethod(out, method);