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

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index b7ed184..4d7a444 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -163,11 +163,14 @@
     }
 
     if (isInterface) {
-        out << "#include <android/hidl/manager/1.0/IServiceNotification.h>\n\n";
+        if (isIBase()) {
+            out << "// skipped #include IServiceNotification.h\n\n";
+        } else {
+            out << "#include <android/hidl/manager/1.0/IServiceNotification.h>\n\n";
+        }
     }
 
-    // TODO b/32756130 change back to HidlSupport.h
-    out << "#include <hidl/HidlTransportSupport.h>\n";
+    out << "#include <hidl/HidlSupport.h>\n";
     out << "#include <hidl/MQDescriptor.h>\n";
 
     if (isInterface) {
@@ -189,7 +192,7 @@
         const Interface *superType = iface->superType();
 
         if (superType == NULL) {
-            out << " : virtual public ::android::hardware::IBase";
+            out << " : virtual public ::android::RefBase";
         } else {
             out << " : public "
                 << superType->fullName();
@@ -220,7 +223,11 @@
         out << "return version;\n";
         out.unindent();
         out << "}\n\n";
-        out << "virtual bool isRemote() const override { return false; }\n\n";
+        out << "virtual bool isRemote() const ";
+        if (!isIBase()) {
+            out << "override ";
+        }
+        out << "{ return false; }\n\n";
 
         for (const auto &method : iface->methods()) {
             out << "\n";
@@ -261,7 +268,9 @@
 
             out << ")";
             if (method->isHidlReserved()) {
-                out << " override";
+                if (!isIBase()) {
+                    out << " override";
+                }
                 out << " {\n";
                 out.indent();
                 method->cppImpl(out);
@@ -288,7 +297,11 @@
 
         out << "\nstatic const char* descriptor;\n\n";
 
-        out << "DECLARE_SERVICE_MANAGER_INTERACTIONS(" << baseName << ")\n\n";
+        if (isIBase()) {
+            out << "// skipped DECLARE_SERVICE_MANAGER_INTERACTIONS\n\n";
+        } else {
+            out << "DECLARE_SERVICE_MANAGER_INTERACTIONS(" << baseName << ")\n\n";
+        }
 
         out << "private: static int hidlStaticBlock;\n";
     }
@@ -865,11 +878,15 @@
     if (err == OK && isInterface) {
         const Interface *iface = mRootScope->getInterface();
 
-        out << "IMPLEMENT_SERVICE_MANAGER_INTERACTIONS("
-            << baseName << ", "
-            << "\"" << iface->fqName().package()
-            << iface->fqName().atVersion()
-            << "\")\n";
+        if (isIBase()) {
+            out << "// skipped IMPLEMENT_SERVICE_MANAGER_INTERACTIONS\n";
+        } else {
+            out << "IMPLEMENT_SERVICE_MANAGER_INTERACTIONS("
+                << baseName << ", "
+                << "\"" << iface->fqName().package()
+                << iface->fqName().atVersion()
+                << "\")\n";
+        }
     }
 
     enterLeaveNamespace(out, false /* enter */);
@@ -993,13 +1010,9 @@
             out, method->results(), true /* forResults */);
 
     out << "_hidl_err = _hidl_data.writeInterfaceToken(";
-    if (method->isHidlReserved()) {
-        out << "::android::hardware::IBase";
-    } else {
-        out << superInterface->fqName().cppNamespace()
-            << "::I"
-            << superInterface->getBaseName();
-    }
+    out << superInterface->fqName().cppNamespace()
+        << "::I"
+        << superInterface->getBaseName();
     out << "::descriptor);\n";
     out << "if (_hidl_err != ::android::OK) { goto _hidl_error; }\n\n";
 
@@ -1282,13 +1295,9 @@
         Formatter &out, const Interface *iface, const Method *method) const {
     out << "if (!_hidl_data.enforceInterface(";
 
-    if (method->isHidlReserved()) {
-        out << "::android::hardware::IBase";
-    } else {
-        out << iface->fqName().cppNamespace()
-            << "::I"
-            << iface->getBaseName();
-    }
+    out << iface->fqName().cppNamespace()
+        << "::I"
+        << iface->getBaseName();
 
     out << "::descriptor)) {\n";