diff options
| author | Christopher Wiley <wiley@google.com> | 2016-01-29 15:11:38 -0800 |
|---|---|---|
| committer | Christopher Wiley <wiley@google.com> | 2016-01-29 15:28:05 -0800 |
| commit | d21bfee0d45a5eb8ffb09eaae3c6d81f3dd292f7 (patch) | |
| tree | 0f37b1333afaa0508168914b4ddbba100fe56393 /generate_java_binder.cpp | |
| parent | f76b59aeac2ce35e954c15c676e9102777ec8faa (diff) | |
| download | android_system_tools_aidl-d21bfee0d45a5eb8ffb09eaae3c6d81f3dd292f7.tar.gz android_system_tools_aidl-d21bfee0d45a5eb8ffb09eaae3c6d81f3dd292f7.tar.bz2 android_system_tools_aidl-d21bfee0d45a5eb8ffb09eaae3c6d81f3dd292f7.zip | |
Fully separate AIDL and Java type namespaces
For android::aidl::ValidatableType, rename:
- QualifiedName() -> CanonicalName()
- Name() -> ShortName()
For android::aidl::java::Type, add a new JavaType() method.
Use that method exclusively when generating Java.
Bug: 26875320
Test: unit and integration tests pass
Change-Id: Ib1d09f4f84d3270634e611f0911f60a2e685cefc
Diffstat (limited to 'generate_java_binder.cpp')
| -rw-r--r-- | generate_java_binder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generate_java_binder.cpp b/generate_java_binder.cpp index 237b993..b692637 100644 --- a/generate_java_binder.cpp +++ b/generate_java_binder.cpp @@ -65,7 +65,7 @@ StubClass::StubClass(const Type* type, const InterfaceType* interfaceType, Field* descriptor = new Field(STATIC | FINAL | PRIVATE, new Variable(types->StringType(), "DESCRIPTOR")); - descriptor->value = "\"" + interfaceType->QualifiedName() + "\""; + descriptor->value = "\"" + interfaceType->JavaType() + "\""; this->elements.push_back(descriptor); // ctor @@ -125,7 +125,7 @@ void StubClass::make_as_interface(const InterfaceType* interfaceType, Method* m = new Method; m->comment = "/**\n * Cast an IBinder object into an "; - m->comment += interfaceType->QualifiedName(); + m->comment += interfaceType->JavaType(); m->comment += " interface,\n"; m->comment += " * generating a proxy if needed.\n */"; m->modifiers = PUBLIC | STATIC; @@ -158,7 +158,7 @@ void StubClass::make_as_interface(const InterfaceType* interfaceType, Comparison* iinNotNull = new Comparison(iin, "!=", NULL_VALUE); Comparison* instOfCheck = new Comparison(iin, " instanceof ", - new LiteralExpression(interfaceType->QualifiedName())); + new LiteralExpression(interfaceType->JavaType())); IfStatement* instOfStatement = new IfStatement(); instOfStatement->expression = new Comparison(iinNotNull, "&&", instOfCheck); instOfStatement->statements = new StatementBlock; |