Revert "Don't force prepend I to header file names"
This reverts commit 7df2c34b6e40828fdf362c665911173e188fe1c4.
Reason for revert: Possible cause of break in stage-aosp-master
Change-Id: I89f2c1c5b645c2434eaac149c32b8220555225e4
diff --git a/aidl.cpp b/aidl.cpp
index b02c5e8..6fc4aa3 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -250,7 +250,7 @@
using ::android::aidl::cpp::ClassNames;
using ::android::aidl::cpp::HeaderFile;
vector<string> headers;
- for (ClassNames c : {ClassNames::CLIENT, ClassNames::SERVER, ClassNames::RAW}) {
+ for (ClassNames c : {ClassNames::CLIENT, ClassNames::SERVER, ClassNames::INTERFACE}) {
headers.push_back(options.OutputHeaderDir() +
HeaderFile(defined_type, c, false /* use_os_sep */));
}
diff --git a/aidl_to_cpp_common.cpp b/aidl_to_cpp_common.cpp
index 9dbcadd..08ecf9b 100644
--- a/aidl_to_cpp_common.cpp
+++ b/aidl_to_cpp_common.cpp
@@ -23,27 +23,27 @@
namespace cpp {
string ClassName(const AidlDefinedType& defined_type, ClassNames type) {
- string base_name = defined_type.GetName();
- if (base_name.length() >= 2 && base_name[0] == 'I' && isupper(base_name[1])) {
- base_name = base_name.substr(1);
- }
+ string c_name = defined_type.GetName();
+
+ if (c_name.length() >= 2 && c_name[0] == 'I' && isupper(c_name[1])) c_name = c_name.substr(1);
switch (type) {
case ClassNames::CLIENT:
- return "Bp" + base_name;
+ c_name = "Bp" + c_name;
+ break;
case ClassNames::SERVER:
- return "Bn" + base_name;
+ c_name = "Bn" + c_name;
+ break;
case ClassNames::INTERFACE:
- return "I" + base_name;
+ c_name = "I" + c_name;
+ break;
case ClassNames::DEFAULT_IMPL:
- return "I" + base_name + "Default";
+ c_name = "I" + c_name + "Default";
+ break;
case ClassNames::BASE:
- return base_name;
- case ClassNames::RAW:
- [[fallthrough]];
- default:
- return defined_type.GetName();
+ break;
}
+ return c_name;
}
std::string HeaderFile(const AidlDefinedType& defined_type, ClassNames class_type,
diff --git a/aidl_to_cpp_common.h b/aidl_to_cpp_common.h
index 3a6e2e6..c8f9853 100644
--- a/aidl_to_cpp_common.h
+++ b/aidl_to_cpp_common.h
@@ -34,7 +34,6 @@
SERVER, // BnFoo
INTERFACE, // IFoo
DEFAULT_IMPL, // IFooDefault
- RAW, // (as shown in the file)
};
string ClassName(const AidlDefinedType& defined_type, ClassNames type);
diff --git a/generate_cpp.cpp b/generate_cpp.cpp
index 544a68f..26b9ffc 100644
--- a/generate_cpp.cpp
+++ b/generate_cpp.cpp
@@ -830,7 +830,7 @@
unique_ptr<Document> BuildInterfaceSource(const TypeNamespace& types,
const AidlInterface& interface, const Options& options) {
vector<string> include_list{
- HeaderFile(interface, ClassNames::RAW, false),
+ HeaderFile(interface, ClassNames::INTERFACE, false),
HeaderFile(interface, ClassNames::CLIENT, false),
};
@@ -907,7 +907,7 @@
const string bp_name = ClassName(interface, ClassNames::CLIENT);
vector<string> includes = {kIBinderHeader, kIInterfaceHeader, "utils/Errors.h",
- HeaderFile(interface, ClassNames::RAW, false)};
+ HeaderFile(interface, ClassNames::INTERFACE, false)};
unique_ptr<ConstructorDecl> constructor{new ConstructorDecl{
bp_name,
@@ -972,7 +972,8 @@
StringPrintf("uint32_t %s", kFlagsVarName)}},
MethodDecl::IS_OVERRIDE
}};
- vector<string> includes = {"binder/IInterface.h", HeaderFile(interface, ClassNames::RAW, false)};
+ vector<string> includes = {"binder/IInterface.h",
+ HeaderFile(interface, ClassNames::INTERFACE, false)};
vector<unique_ptr<Declaration>> publics;
publics.push_back(std::move(on_transact));
@@ -1218,7 +1219,6 @@
switch (header_type) {
case ClassNames::INTERFACE:
header = BuildInterfaceHeader(types, interface, options);
- header_type = ClassNames::RAW;
break;
case ClassNames::CLIENT:
header = BuildClientHeader(types, interface, options);
@@ -1293,7 +1293,7 @@
return false;
}
- const string header_path = options.OutputHeaderDir() + HeaderFile(parcelable, ClassNames::RAW);
+ const string header_path = options.OutputHeaderDir() + HeaderFile(parcelable, ClassNames::BASE);
unique_ptr<CodeWriter> header_writer(io_delegate.GetCodeWriter(header_path));
header->Write(header_writer.get());
CHECK(header_writer->Close());
diff --git a/generate_ndk.cpp b/generate_ndk.cpp
index cafd794..fa90a58 100644
--- a/generate_ndk.cpp
+++ b/generate_ndk.cpp
@@ -38,7 +38,8 @@
void GenerateNdkInterface(const string& output_file, const Options& options,
const AidlTypenames& types, const AidlInterface& defined_type,
const IoDelegate& io_delegate) {
- const string i_header = options.OutputHeaderDir() + NdkHeaderFile(defined_type, ClassNames::RAW);
+ const string i_header =
+ options.OutputHeaderDir() + NdkHeaderFile(defined_type, ClassNames::INTERFACE);
unique_ptr<CodeWriter> i_writer(io_delegate.GetCodeWriter(i_header));
GenerateInterfaceHeader(*i_writer, types, defined_type, options);
CHECK(i_writer->Close());
@@ -64,7 +65,7 @@
const AidlTypenames& types, const AidlStructuredParcelable& defined_type,
const IoDelegate& io_delegate) {
const string header_path =
- options.OutputHeaderDir() + NdkHeaderFile(defined_type, ClassNames::RAW);
+ options.OutputHeaderDir() + NdkHeaderFile(defined_type, ClassNames::BASE);
unique_ptr<CodeWriter> header_writer(io_delegate.GetCodeWriter(header_path));
GenerateParcelHeader(*header_writer, types, defined_type, options);
CHECK(header_writer->Close());
@@ -145,7 +146,8 @@
if (other_defined_type.AsInterface() != nullptr) {
out << "#include <"
- << NdkHeaderFile(other_defined_type, ClassNames::RAW, false /*use_os_sep*/) << ">\n";
+ << NdkHeaderFile(other_defined_type, ClassNames::INTERFACE, 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";
@@ -164,8 +166,8 @@
<< ">\n";
out << "#include <" << NdkHeaderFile(a_defined_type, ClassNames::SERVER, false /*use_os_sep*/)
<< ">\n";
- out << "#include <" << NdkHeaderFile(a_defined_type, ClassNames::RAW, false /*use_os_sep*/)
- << ">\n";
+ out << "#include <"
+ << NdkHeaderFile(a_defined_type, ClassNames::INTERFACE, false /*use_os_sep*/) << ">\n";
}
});
}
@@ -581,7 +583,7 @@
const std::string clazz = ClassName(defined_type, ClassNames::CLIENT);
out << "#pragma once\n\n";
- out << "#include \"" << NdkHeaderFile(defined_type, ClassNames::RAW, false /*use_os_sep*/)
+ out << "#include \"" << NdkHeaderFile(defined_type, ClassNames::INTERFACE, false /*use_os_sep*/)
<< "\"\n";
out << "\n";
out << "#include <android/binder_ibinder.h>\n";
@@ -612,7 +614,7 @@
const std::string iface = ClassName(defined_type, ClassNames::INTERFACE);
out << "#pragma once\n\n";
- out << "#include \"" << NdkHeaderFile(defined_type, ClassNames::RAW, false /*use_os_sep*/)
+ out << "#include \"" << NdkHeaderFile(defined_type, ClassNames::INTERFACE, false /*use_os_sep*/)
<< "\"\n";
out << "\n";
out << "#include <android/binder_ibinder.h>\n";
@@ -748,7 +750,7 @@
const Options& /*options*/) {
const std::string clazz = ClassName(defined_type, ClassNames::BASE);
- out << "#include \"" << NdkHeaderFile(defined_type, ClassNames::RAW, false /*use_os_sep*/)
+ out << "#include \"" << NdkHeaderFile(defined_type, ClassNames::BASE, false /*use_os_sep*/)
<< "\"\n";
out << "\n";
GenerateSourceIncludes(out, types, defined_type);