commit fb7da2e62fe66b0a57ffbb0304f5884024a68f1c
author Casey Dahlin <sadmac@google.com> Thu Oct 08 17:26:09 2015 -0700
committer Casey Dahlin <sadmac@google.com> Fri Oct 09 17:11:02 2015 -0700
tree 60c6fb9de034c27dd764799d3d3a9ad653e9cad6
parent 1ae2bc56d20fe0e19262f2721abc338662fa6e30

Put AidlInterface members behind methods

Change-Id: Ib367a9183e734a008acecf90c5f3f25e51e16b37
Test: Full android build
Bug: 24410295
Signed-off-by: Casey Dahlin <sadmac@google.com>

generate_java_binder.cpp

diff --git a/generate_java_binder.cpp b/generate_java_binder.cpp
index 1dc5dc7..fcd82c2 100644
--- a/generate_java_binder.cpp
+++ b/generate_java_binder.cpp
@@ -518,11 +518,11 @@
                                 JavaTypeNamespace* types)
 {
     const InterfaceType* interfaceType = static_cast<const InterfaceType*>(
-        types->Find(iface->package, iface->name.data));
+        types->Find(iface->GetCanonicalName()));
 
     // the interface class
     Class* interface = new Class;
-        interface->comment = gather_comments(iface->comments_token->extra);
+        interface->comment = iface->GetComments();
         interface->modifiers = PUBLIC;
         interface->what = Class::INTERFACE;
         interface->type = interfaceType;
@@ -530,15 +530,14 @@
 
     // the stub inner class
     StubClass* stub = new StubClass(
-        types->Find(iface->package, append(iface->name.data, ".Stub").c_str()),
+        types->Find(iface->GetCanonicalName() + ".Stub"),
         interfaceType, types);
     interface->elements.push_back(stub);
 
     // the proxy inner class
     ProxyClass* proxy = new ProxyClass(
         types,
-        types->Find(iface->package,
-                         append(iface->name.data, ".Stub.Proxy").c_str()),
+        types->Find(iface->GetCanonicalName() + ".Stub.Proxy"),
         interfaceType);
     stub->elements.push_back(proxy);
 
@@ -547,7 +546,7 @@
 
     // all the declared methods of the interface
     int index = 0;
-    for (const auto& item : *iface->methods) {
+    for (const auto& item : iface->GetMethods()) {
         generate_method(*item, interface, stub, proxy,
                         item->GetId(), types);
         index++;