diff options
| -rw-r--r-- | aidl_to_ndk.cpp | 4 | ||||
| -rw-r--r-- | generate_cpp.cpp | 4 | ||||
| -rw-r--r-- | generate_ndk.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/aidl_to_ndk.cpp b/aidl_to_ndk.cpp index bc8c18a7..c5bb0210 100644 --- a/aidl_to_ndk.cpp +++ b/aidl_to_ndk.cpp @@ -136,7 +136,7 @@ TypeInfo InterfaceTypeInfo(const AidlInterface& type) { } TypeInfo ParcelableTypeInfo(const AidlParcelable& type) { - const std::string clazz = NdkFullClassName(type, cpp::ClassNames::BASE); + const std::string clazz = NdkFullClassName(type, cpp::ClassNames::RAW); return TypeInfo{ .raw = @@ -164,7 +164,7 @@ TypeInfo ParcelableTypeInfo(const AidlParcelable& type) { } TypeInfo EnumDeclarationTypeInfo(const AidlEnumDeclaration& enum_decl) { - const std::string clazz = NdkFullClassName(enum_decl, cpp::ClassNames::BASE); + const std::string clazz = NdkFullClassName(enum_decl, cpp::ClassNames::RAW); static map<std::string, std::string> kAParcelTypeNameMap = { {"byte", "Byte"}, diff --git a/generate_cpp.cpp b/generate_cpp.cpp index 88f05ca5..81c92cf9 100644 --- a/generate_cpp.cpp +++ b/generate_cpp.cpp @@ -1054,7 +1054,7 @@ std::unique_ptr<Document> BuildParcelHeader(const AidlTypenames& typenames, parcel_class->AddPublic(std::move(write)); return unique_ptr<Document>{new CppHeader{ - BuildHeaderGuard(parcel, ClassNames::BASE), vector<string>(includes.begin(), includes.end()), + BuildHeaderGuard(parcel, ClassNames::RAW), vector<string>(includes.begin(), includes.end()), NestInNamespaces(std::move(parcel_class), parcel.GetSplitPackage())}}; } std::unique_ptr<Document> BuildParcelSource(const AidlTypenames& typenames, @@ -1174,7 +1174,7 @@ std::unique_ptr<Document> BuildEnumHeader(const AidlTypenames& typenames, unique_ptr<Declaration>(new LiteralDecl(GenerateEnumToString(typenames, enum_decl)))); return unique_ptr<Document>{ - new CppHeader{BuildHeaderGuard(enum_decl, ClassNames::BASE), + new CppHeader{BuildHeaderGuard(enum_decl, ClassNames::RAW), vector<string>(includes.begin(), includes.end()), NestInNamespaces(std::move(decls), enum_decl.GetSplitPackage())}}; } diff --git a/generate_ndk.cpp b/generate_ndk.cpp index c1222e95..51822ba4 100644 --- a/generate_ndk.cpp +++ b/generate_ndk.cpp @@ -187,12 +187,12 @@ static void GenerateHeaderIncludes(CodeWriter& out, const AidlTypenames& types, << NdkHeaderFile(other_defined_type, ClassNames::RAW, false /*use_os_sep*/) << ">\n"; } else if (other_defined_type.AsStructuredParcelable() != nullptr) { out << "#include <" - << NdkHeaderFile(other_defined_type, ClassNames::BASE, false /*use_os_sep*/) << ">\n"; + << NdkHeaderFile(other_defined_type, ClassNames::RAW, false /*use_os_sep*/) << ">\n"; } else if (other_defined_type.AsParcelable() != nullptr) { out << "#include \"" << other_defined_type.AsParcelable()->GetCppHeader() << "\"\n"; } else if (other_defined_type.AsEnumDeclaration() != nullptr) { out << "#include <" - << NdkHeaderFile(other_defined_type, ClassNames::BASE, false /*use_os_sep*/) << ">\n"; + << NdkHeaderFile(other_defined_type, ClassNames::RAW, false /*use_os_sep*/) << ">\n"; } else { AIDL_FATAL(defined_type) << "Unrecognized type."; } @@ -821,7 +821,7 @@ void GenerateInterfaceHeader(CodeWriter& out, const AidlTypenames& types, void GenerateParcelHeader(CodeWriter& out, const AidlTypenames& types, const AidlStructuredParcelable& defined_type, const Options& /*options*/) { - const std::string clazz = ClassName(defined_type, ClassNames::BASE); + const std::string clazz = ClassName(defined_type, ClassNames::RAW); out << "#pragma once\n"; out << "#include <android/binder_interface_utils.h>\n"; @@ -852,7 +852,7 @@ void GenerateParcelHeader(CodeWriter& out, const AidlTypenames& types, void GenerateParcelSource(CodeWriter& out, const AidlTypenames& types, const AidlStructuredParcelable& defined_type, const Options& /*options*/) { - const std::string clazz = ClassName(defined_type, ClassNames::BASE); + const std::string clazz = ClassName(defined_type, ClassNames::RAW); out << "#include \"" << NdkHeaderFile(defined_type, ClassNames::RAW, false /*use_os_sep*/) << "\"\n"; |