diff options
Diffstat (limited to 'tools/aidl/aidl.cpp')
| -rw-r--r-- | tools/aidl/aidl.cpp | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp index fb4067aa22f7..78404cb745b2 100644 --- a/tools/aidl/aidl.cpp +++ b/tools/aidl/aidl.cpp @@ -29,7 +29,7 @@ static void test_document(document_item_type* d) { while (d) { - if (d->item_type == INTERFACE_TYPE) { + if (d->item_type == INTERFACE_TYPE_BINDER) { interface_type* c = (interface_type*)d; printf("interface %s %s {\n", c->package, c->name.data); interface_item_type *q = (interface_item_type*)c->interface_items; @@ -242,7 +242,8 @@ check_filenames(const char* filename, document_item_type* items) parcelable_type* p = (parcelable_type*)items; err |= check_filename(filename, p->package, &p->name); } - else if (items->item_type == INTERFACE_TYPE) { + else if (items->item_type == INTERFACE_TYPE_BINDER + || items->item_type == INTERFACE_TYPE_RPC) { interface_type* c = (interface_type*)items; err |= check_filename(filename, c->package, &c->name); } @@ -295,7 +296,8 @@ gather_types(const char* filename, document_item_type* items) type = new ParcelableType(p->package ? p->package : "", p->name.data, false, filename, p->name.lineno); } - else if (items->item_type == INTERFACE_TYPE) { + else if (items->item_type == INTERFACE_TYPE_BINDER + || items->item_type == INTERFACE_TYPE_RPC) { interface_type* c = (interface_type*)items; type = new InterfaceType(c->package ? c->package : "", c->name.data, false, c->oneway, @@ -310,7 +312,7 @@ gather_types(const char* filename, document_item_type* items) if (old == NULL) { NAMES.Add(type); - if (items->item_type == INTERFACE_TYPE) { + if (items->item_type == INTERFACE_TYPE_BINDER) { // for interfaces, also add the stub and proxy types, we don't // bother checking these for duplicates, because the parser // won't let us do it. @@ -330,6 +332,19 @@ gather_types(const char* filename, document_item_type* items) filename, c->name.lineno); NAMES.Add(proxy); } + else if (items->item_type == INTERFACE_TYPE_RPC) { + // for interfaces, also add the service base type, we don't + // bother checking these for duplicates, because the parser + // won't let us do it. + interface_type* c = (interface_type*)items; + + string name = c->name.data; + name += ".ServiceBase"; + Type* base = new Type(c->package ? c->package : "", + name, Type::GENERATED, false, false, + filename, c->name.lineno); + NAMES.Add(base); + } } else { if (old->Kind() == Type::BUILT_IN) { fprintf(stderr, "%s:%d attempt to redefine built in class %s\n", @@ -498,7 +513,7 @@ check_types(const char* filename, document_item_type* items) int err = 0; while (items) { // (nothing to check for PARCELABLE_TYPE) - if (items->item_type == INTERFACE_TYPE) { + if (items->item_type == INTERFACE_TYPE_BINDER) { map<string,method_type*> methodNames; interface_type* c = (interface_type*)items; @@ -544,7 +559,10 @@ exactly_one_interface(const char* filename, const document_item_type* items, con const document_item_type* next = items->next; if (items->next != NULL) { int lineno = -1; - if (next->item_type == INTERFACE_TYPE) { + if (next->item_type == INTERFACE_TYPE_BINDER) { + lineno = ((interface_type*)next)->interface_token.lineno; + } + else if (next->item_type == INTERFACE_TYPE_RPC) { lineno = ((interface_type*)next)->interface_token.lineno; } else if (next->item_type == PARCELABLE_TYPE) { @@ -598,7 +616,7 @@ generate_dep_file(const Options& options, const document_item_type* items) slash = ""; } - if (items->item_type == INTERFACE_TYPE) { + if (items->item_type == INTERFACE_TYPE_BINDER || items->item_type == INTERFACE_TYPE_RPC) { fprintf(to, "%s: \\\n", options.outputFileName.c_str()); } else { // parcelable: there's no output file. @@ -658,7 +676,7 @@ static string generate_outputFileName(const Options& options, const document_item_type* items) { // items has already been checked to have only one interface. - if (items->item_type == INTERFACE_TYPE) { + if (items->item_type == INTERFACE_TYPE_BINDER || items->item_type == INTERFACE_TYPE_RPC) { interface_type* type = (interface_type*)items; return generate_outputFileName2(options, type->name, type->package); @@ -751,7 +769,7 @@ parse_preprocessed_file(const string& filename) interface_type* iface = (interface_type*)malloc( sizeof(interface_type)); memset(iface, 0, sizeof(interface_type)); - iface->document_item.item_type = INTERFACE_TYPE; + iface->document_item.item_type = INTERFACE_TYPE_BINDER; iface->interface_token.lineno = lineno; iface->interface_token.data = strdup(type); iface->package = packagename ? strdup(packagename) : NULL; @@ -995,5 +1013,3 @@ main(int argc, const char **argv) fprintf(stderr, "aidl: internal error\n"); return 1; } - - |