commit c55c9b2fd76415021ebd03d2d4983b9dd14fa5d7
author Treehugger Robot <treehugger-gerrit@google.com> Sat Dec 10 05:31:33 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 10 05:31:34 2016 +0000
tree de74196331d2b9edc470e05c892d0ecc5724c774
parent 4ffcf39d4ab32d92e8dc5d3303bad365e634c35a
parent 819799325a85c5f9e60860076d52cde91ac87e4f

Merge "Add warning message when -Lmakefile does nothing."

hidl-gen_y.yy

diff --git a/hidl-gen_y.yy b/hidl-gen_y.yy
index e44e488..413dc1e 100644
--- a/hidl-gen_y.yy
+++ b/hidl-gen_y.yy
@@ -52,7 +52,10 @@
     static const std::vector<std::string> reserved({
         // Injected names to interfaces by auto-generated code
         "isRemote", "descriptor", "hidlStaticBlock", "onTransact",
-        "castFrom", "version", "getInterfaceVersion",
+        "castFrom", "version", "getInterfaceVersion", "Proxy", "Stub",
+
+        // Inherited methods from IBase is detected in addMethod. Not added here
+        // because we need hidl-gen to compile IBase.
 
         // Inherited names by interfaces from IInterface / IBinder
         "onAsBinder", "asBinder", "queryLocalInterface", "getInterfaceDescriptor", "isBinderAlive",