Merge "Allow multiple 'parcelable' declarations in aidl files" into jb-mr1-dev (71779b9f) · Commits · e / os / android_frameworks_base

tools/aidl/aidl.cpp

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -590,7 +590,8 @@ exactly_one_interface(const char* filename, const document_item_type* items, con
	}		}

	const document_item_type* next = items->next;		const document_item_type* next = items->next;
	if (items->next != NULL) {		// Allow parcelables to skip the "one-only" rule.
			if (items->next != NULL && next->item_type != USER_DATA_TYPE) {
	int lineno = -1;		int lineno = -1;
	if (next->item_type == INTERFACE_TYPE_BINDER) {		if (next->item_type == INTERFACE_TYPE_BINDER) {
	lineno = ((interface_type*)next)->interface_token.lineno;		lineno = ((interface_type*)next)->interface_token.lineno;
	@@ -598,9 +599,6 @@ exactly_one_interface(const char* filename, const document_item_type* items, con
	else if (next->item_type == INTERFACE_TYPE_RPC) {		else if (next->item_type == INTERFACE_TYPE_RPC) {
	lineno = ((interface_type*)next)->interface_token.lineno;		lineno = ((interface_type*)next)->interface_token.lineno;
	}		}
	else if (next->item_type == USER_DATA_TYPE) {
	lineno = ((user_data_type*)next)->keyword_token.lineno;
	}
	fprintf(stderr, "%s:%d aidl can only handle one interface per file\n",		fprintf(stderr, "%s:%d aidl can only handle one interface per file\n",
	filename, lineno);		filename, lineno);
	return 1;		return 1;