commit 119f521b1b03ce29c2e7f79c132483313e30a80a
author Martijn Coenen <maco@google.com> Fri Nov 04 15:24:30 2016 +0000
committer Martijn Coenen <maco@google.com> Fri Nov 04 15:24:30 2016 +0000
tree 48c593ece8aff1f0e631d67d959261d945516557
parent 21247bffb412ede7d5a752afa489d1567cacad99

Revert "Don't show HIDL_GENERATED_ with -Lc++-impl."

This reverts commit 21247bffb412ede7d5a752afa489d1567cacad99.

Change-Id: I2509c696001f166dc40762d59e74c46265d16b5c

AST.h

diff --git a/AST.h b/AST.h
index 12dfc89..a4b4cda 100644
--- a/AST.h
+++ b/AST.h
@@ -153,8 +153,7 @@
             const FQName &package,
             const std::string &klass);
 
-    std::string makeHeaderGuard(const std::string &baseName,
-                                bool indicateGenerated = true) const;
+    std::string makeHeaderGuard(const std::string &baseName) const;
     void enterLeaveNamespace(Formatter &out, bool enter) const;
 
     static void generateCheckNonNull(Formatter &out, const std::string &nonNull);

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index d689150..f17025c 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -67,14 +67,8 @@
     mPackage.getPackageAndVersionComponents(components, cpp_compatible);
 }
 
-std::string AST::makeHeaderGuard(const std::string &baseName,
-                                 bool indicateGenerated) const {
-    std::string guard;
-
-    if (indicateGenerated) {
-        guard += "HIDL_GENERATED_";
-    }
-
+std::string AST::makeHeaderGuard(const std::string &baseName) const {
+    std::string guard = "HIDL_GENERATED_";
     guard += mPackage.tokenName();
 
     guard += "_";
@@ -798,8 +792,8 @@
         out << "IMPLEMENT_REGISTER_AND_GET_SERVICE("
             << baseName << ", "
             << "\"" << iface->fqName().package()
-            << iface->fqName().atVersion()
-            << "\")\n";
+            << iface->fqName().atVersion() << "-impl.so\""
+            << ")\n";
     }
 
     enterLeaveNamespace(out, false /* enter */);

generateCppImpl.cpp

diff --git a/generateCppImpl.cpp b/generateCppImpl.cpp
index caa0ac0..25310f5 100644
--- a/generateCppImpl.cpp
+++ b/generateCppImpl.cpp
@@ -104,7 +104,7 @@
 
     Formatter out(file);
 
-    const std::string guard = makeHeaderGuard(baseName, false /* indicateGenerated */);
+    const std::string guard = makeHeaderGuard(baseName);
 
     out << "#ifndef " << guard << "\n";
     out << "#define " << guard << "\n\n";