Don't use anonymous literal structures for RS object types.
Bug: 22926131
Using an anonymous structure type prevents us from being able to use
LLVM to determine the actual typename. This is problematic, because
there are some cases where bcc needs to be able to detect/act on RS
object types. Giving each of these structures a legitimate name has no
impact on the generated code (since we are already using typedefs).
This change is also safe for targeting prior Android releases with our
toolchain.
This change also adjusts the API generator to ensure that we can
generate relevant code/docs/tests for handling RS objects. A new
TypeKind is added for RS_OBJECT, instead of using SIMPLE.
Change-Id: Iaff928f5821af66cfc9b3aea2ff5549d0c8a9408
diff --git a/api/GenerateStubsWhiteList.cpp b/api/GenerateStubsWhiteList.cpp
index ea18eed..9b4297d 100644
--- a/api/GenerateStubsWhiteList.cpp
+++ b/api/GenerateStubsWhiteList.cpp
@@ -70,21 +70,14 @@
}
switch (spec->getKind()) {
case SIMPLE: {
- /* For simple typedefs, replace it unless it's the special case of _RS_HANDLE
- * which is a macro of a struct.
- */
- const string s = spec->getSimpleType();
- if (s != "_RS_HANDLE") {
- return s;
- }
+ return spec->getSimpleType();
+ }
+ case RS_OBJECT: {
+ // Do nothing for RS object types.
break;
}
case STRUCT: {
- const string s = spec->getStructName();
- if (!s.empty()) {
- return s;
- }
- break;
+ return spec->getStructName();
}
case ENUM:
// Do nothing
