commit c89340422f53046bfe24ff3e529161f9194120f8
author Yifan Hong <elsk@google.com> Thu Nov 17 17:10:52 2016 -0800
committer Yifan Hong <elsk@google.com> Fri Dec 02 15:10:48 2016 -0800
tree 639caeac6a268adc13b87bc8ba2374b4563f2f1f
parent 99e6bebc96d75d1c9b9b8130cd9b880dacb95b01

Hidlize IBase; use IBase instead of IBinder.

* IBase is hidlized over hwbinder. GenericBinder
  is removed and Interface with name
  android.hidl.base@1.0::IBase is used instead.

* Removed AST::mImportedNamesForJava, because in Java,
  we always refer to a type with the full name. We don't
  import anything in the java file.

* IFoo.h now includes HidlSupport.h instead of
  HidlTransportSupport.h

Test: hidl_test
Test: hidl_test_java

Fix: 32756130
Fix: 33273293

Change-Id: I435ad7c68dea028a16252148b6f5778e3610b7cd

hidl-gen_y.yy

diff --git a/hidl-gen_y.yy b/hidl-gen_y.yy
index 186fb61..85c0b8e 100644
--- a/hidl-gen_y.yy
+++ b/hidl-gen_y.yy
@@ -23,7 +23,6 @@
 #include "ConstantExpression.h"
 #include "EnumType.h"
 #include "FQName.h"
-#include "GenericBinder.h"
 #include "Interface.h"
 #include "Location.h"
 #include "Method.h"
@@ -52,7 +51,7 @@
 bool isValidInterfaceField(const char *identifier, std::string *errorMsg) {
     static const std::vector<std::string> reserved({
         // Injected names to interfaces by auto-generated code
-        "isRemote", "interfaceChain", "descriptor", "hidlStaticBlock", "onTransact",
+        "isRemote", "descriptor", "hidlStaticBlock", "onTransact",
         "castFrom", "version", "getInterfaceVersion",
 
         // Inherited names by interfaces from IInterface / IBinder
@@ -585,7 +584,22 @@
 interface_declaration
     : INTERFACE valid_identifier opt_extends
       {
-          if ($3 != NULL && !$3->isInterface()) {
+          Type *parent = $3;
+
+          if (ast->package() != gIBasePackageFqName) {
+              if (!ast->addImport(gIBaseFqName.string().c_str())) {
+                  std::cerr << "ERROR: Unable to automatically import '"
+                            << gIBaseFqName.string()
+                            << "' at " << @$
+                            << "\n";
+                  YYERROR;
+              }
+              if (parent == nullptr) {
+                parent = ast->lookupType(gIBaseFqName);
+              }
+          }
+
+          if (parent != NULL && !parent->isInterface()) {
               std::cerr << "ERROR: You can only extend interfaces. at " << @3
                         << "\n";
 
@@ -599,7 +613,7 @@
               YYERROR;
           }
 
-          Interface *iface = new Interface($2, convertYYLoc(@2), static_cast<Interface *>($3));
+          Interface *iface = new Interface($2, convertYYLoc(@2), static_cast<Interface *>(parent));
 
           // Register interface immediately so it can be referenced inside
           // definition.
@@ -975,7 +989,18 @@
     : array_type_base { $$ = $1; }
     | array_type { $$ = $1; }
     | annotated_compound_declaration { $$ = $1; }
-    | INTERFACE { $$ = new GenericBinder; }
+    | INTERFACE
+      {
+          // "interface" is a synonym of android.hidl.base@1.0::IBase
+          $$ = ast->lookupType(gIBaseFqName);
+          if ($$ == nullptr) {
+              std::cerr << "FATAL: Cannot find "
+                        << gIBaseFqName.string()
+                        << " at " << @1 << "\n";
+
+              YYERROR;
+      }
+    }
     ;
 
 %%