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

main.cpp

diff --git a/main.cpp b/main.cpp
index c33ce5e..4701757 100644
--- a/main.cpp
+++ b/main.cpp
@@ -188,10 +188,11 @@
     out.indent();
     out.indent();
     out << "\n$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \\"
-        << "\n-Ljava"
-        << " -r"
-        << coordinator->getPackageRoot(packageFQName) << ":"
-        << coordinator->getPackageRootPath(packageFQName) << " \\\n";
+        << "\n-Ljava \\"
+        << "\n-r"
+        << coordinator->getPackageRootOption(packageFQName) << " \\"
+        << "\n-r"
+        << coordinator->getPackageRootOption(gIBasePackageFqName) << " \\\n";
 
     out << packageFQName.string()
         << "::"
@@ -364,10 +365,11 @@
     out.indent();
     out.indent();
     out << "\n$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \\"
-        << "\n-Ljava-constants"
-        << " -r"
-        << coordinator->getPackageRoot(packageFQName) << ":"
-        << coordinator->getPackageRootPath(packageFQName) << " \\\n";
+        << "\n-Ljava-constants \\"
+        << "\n-r"
+        << coordinator->getPackageRootOption(packageFQName) << " \\"
+        << "\n-r"
+        << coordinator->getPackageRootOption(gIBasePackageFqName) << " \\\n";
 
     out << packageFQName.string();
     out << "\n";
@@ -587,8 +589,9 @@
     out << "cmd: \"$(location " << hidl_gen << ") -o $(genDir)"
         << " -L" << language
         << " -r"
-        << coordinator->getPackageRoot(packageFQName) << ":"
-        << coordinator->getPackageRootPath(packageFQName)
+        << coordinator->getPackageRootOption(packageFQName)
+        << " -r"
+        << coordinator->getPackageRootOption(gIBasePackageFqName)
         << " " << packageFQName.string() << "\",\n";
 
     out << "srcs: [\n";