hidl-gen: remove references to AIDL
git grep -l _aidl_ . | xargs sed -i -e 's/_aidl_/_hidl_/g'
b/30778629 Generated code has many references to AIDL
Change-Id: I3172e7da7acd6ba8c8c332be7316317b0eb59136
Signed-off-by: Iliyan Malchev <malchev@google.com>
diff --git a/Type.cpp b/Type.cpp
index 6d0e4e8..bec4655 100644
--- a/Type.cpp
+++ b/Type.cpp
@@ -72,25 +72,25 @@
switch (mode) {
case ErrorMode_Ignore:
{
- out << "/* _aidl_err ignored! */\n\n";
+ out << "/* _hidl_err ignored! */\n\n";
break;
}
case ErrorMode_Goto:
{
- out << "if (_aidl_err != ::android::OK) { goto _aidl_error; }\n\n";
+ out << "if (_hidl_err != ::android::OK) { goto _hidl_error; }\n\n";
break;
}
case ErrorMode_Break:
{
- out << "if (_aidl_err != ::android::OK) { break; }\n\n";
+ out << "if (_hidl_err != ::android::OK) { break; }\n\n";
break;
}
case ErrorMode_Return:
{
- out << "if (_aidl_err != ::android::OK) { return _aidl_err; }\n\n";
+ out << "if (_hidl_err != ::android::OK) { return _hidl_err; }\n\n";
break;
}
}
@@ -100,7 +100,7 @@
switch (mode) {
case ErrorMode_Goto:
{
- out << "goto _aidl_error;\n";
+ out << "goto _hidl_error;\n";
break;
}
@@ -112,13 +112,13 @@
case ErrorMode_Ignore:
{
- out << "/* ignoring _aidl_error! */";
+ out << "/* ignoring _hidl_error! */";
break;
}
case ErrorMode_Return:
{
- out << "return _aidl_err;\n";
+ out << "return _hidl_err;\n";
break;
}
}
@@ -145,7 +145,7 @@
const std::string nameDeref = name + (nameIsPointer ? "->" : ".");
const std::string namePointer = nameIsPointer ? name : ("&" + name);
- out << "_aidl_err = ";
+ out << "_hidl_err = ";
if (isReader) {
out << "const_cast<"