diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aidl/aidl_language_y.y | 2 | ||||
| -rw-r--r-- | tools/aidl/generate_java_rpc.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/aidl/aidl_language_y.y b/tools/aidl/aidl_language_y.y index cc04d15..3c16e15 100644 --- a/tools/aidl/aidl_language_y.y +++ b/tools/aidl/aidl_language_y.y @@ -87,7 +87,7 @@ parcelable_decl: b->name = $2.buffer; b->package = g_currentPackage ? strdup(g_currentPackage) : NULL; b->semicolon_token = $3.buffer; - b->flattening_methods = PARCELABLE_DATA; + b->flattening_methods = PARCELABLE_DATA | RPC_DATA; $$.user_data = b; } | PARCELABLE ';' { diff --git a/tools/aidl/generate_java_rpc.cpp b/tools/aidl/generate_java_rpc.cpp index e4867e4..852b0c1 100644 --- a/tools/aidl/generate_java_rpc.cpp +++ b/tools/aidl/generate_java_rpc.cpp @@ -5,7 +5,7 @@ #include <stdlib.h> #include <string.h> -Type* SERVICE_CONTEXT_TYPE = new Type("android.content", +Type* ANDROID_CONTEXT_TYPE = new Type("android.content", "Context", Type::BUILT_IN, false, false, false); Type* PRESENTER_BASE_TYPE = new Type("com.android.athome.connector", "EventListener", Type::BUILT_IN, false, false, false); @@ -13,8 +13,6 @@ Type* PRESENTER_LISTENER_BASE_TYPE = new Type("com.android.athome.connector", "EventListener.Listener", Type::BUILT_IN, false, false, false); Type* RPC_BROKER_TYPE = new Type("com.android.athome.connector", "Broker", Type::BUILT_IN, false, false, false); -Type* RPC_CONTAINER_TYPE = new Type("com.android.athome.connector", "ConnectorContainer", - Type::BUILT_IN, false, false, false); // TODO: Just use Endpoint, so this works for all endpoints. Type* RPC_CONNECTOR_TYPE = new Type("com.android.athome.connector", "Connector", Type::BUILT_IN, false, false, false); @@ -458,7 +456,7 @@ EndpointBaseClass::~EndpointBaseClass() void EndpointBaseClass::generate_ctor() { - Variable* container = new Variable(RPC_CONTAINER_TYPE, "container"); + Variable* container = new Variable(ANDROID_CONTEXT_TYPE, "context"); Variable* broker = new Variable(RPC_BROKER_TYPE, "broker"); Method* ctor = new Method; ctor->modifiers = PUBLIC; |