commit 9200af02eb1d50922385ab79686824001a4f166f
author Neel Mehta <mneel@google.com> Fri Jul 19 13:24:57 2019 -0700
committer Neel Mehta <mneel@google.com> Tue Jul 23 10:37:37 2019 -0700
tree ead6125974d87b85d52ff2ddcca2674368f0c608
parent 60cbebe2f3c3965f4e1698d66b6a97639a00bda7

Remove localName from NamedType

The Formatter CL introduced definedName to type which is the very thing
that NamedType::localName already did.

Thus localName should be removed.

Bug: 137553653
Test: ./test/run_all_*_test.sh
Change-Id: I61bff460d77d7b880831115be0602a49669fd7be
Merged-In: I61bff460d77d7b880831115be0602a49669fd7be

generateCppImpl.cpp

diff --git a/generateCppImpl.cpp b/generateCppImpl.cpp
index 1485119..278334d 100644
--- a/generateCppImpl.cpp
+++ b/generateCppImpl.cpp
@@ -80,7 +80,7 @@
     out << "// FIXME: your file license if you have one\n\n";
     out << "#pragma once\n\n";
 
-    generateCppPackageInclude(out, mPackage, iface->localName());
+    generateCppPackageInclude(out, mPackage, iface->definedName());
 
     out << "#include <hidl/MQDescriptor.h>\n";
     out << "#include <hidl/Status.h>\n\n";
@@ -98,11 +98,7 @@
 
     out << "\n";
 
-    out << "struct "
-        << baseName
-        << " : public "
-        << iface->localName()
-        << " {\n";
+    out << "struct " << baseName << " : public " << iface->definedName() << " {\n";
 
     out.indent();
 
@@ -121,10 +117,8 @@
     out << "};\n\n";
 
     out << "// FIXME: most likely delete, this is only for passthrough implementations\n"
-        << "// extern \"C\" "
-        << iface->localName()
-        << "* ";
-    generateFetchSymbol(out, iface->localName());
+        << "// extern \"C\" " << iface->definedName() << "* ";
+    generateFetchSymbol(out, iface->definedName());
     out << "(const char* name);\n\n";
 
     out << "}  // namespace implementation\n";
@@ -151,9 +145,8 @@
     });
 
     out.setLinePrefix("//");
-    out << iface->localName()
-        << "* ";
-    generateFetchSymbol(out, iface->localName());
+    out << iface->definedName() << "* ";
+    generateFetchSymbol(out, iface->definedName());
     out << "(const char* /* name */) {\n";
     out.indent();
     out << "return new " << baseName << "();\n";