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/VectorType.cpp b/VectorType.cpp
index 055b5a3..fcfda4b 100644
--- a/VectorType.cpp
+++ b/VectorType.cpp
@@ -40,7 +40,7 @@
std::string baseExtra;
std::string baseType = mElementType->getCppType(&baseExtra);
- const std::string parentName = "_aidl_" + name + "_parent";
+ const std::string parentName = "_hidl_" + name + "_parent";
out << "size_t " << parentName << ";\n\n";
@@ -61,13 +61,13 @@
out.indent();
- out << "_aidl_err = ::android::UNKNOWN_ERROR;\n";
+ out << "_hidl_err = ::android::UNKNOWN_ERROR;\n";
handleError2(out, mode);
out.unindent();
out << "}\n\n";
} else {
- out << "_aidl_err = "
+ out << "_hidl_err = "
<< parcelObjDeref
<< "writeBuffer(&"
<< name
@@ -105,7 +105,7 @@
std::string baseExtra;
std::string baseType = Type::getCppType(&baseExtra);
- const std::string childName = "_aidl_" + name + "_child";
+ const std::string childName = "_hidl_" + name + "_child";
out << "size_t " << childName << ";\n\n";
emitReaderWriterEmbeddedForTypeName(
@@ -129,22 +129,22 @@
baseType = mElementType->getCppType(&baseExtra);
- out << "for (size_t _aidl_index = 0; _aidl_index < "
+ out << "for (size_t _hidl_index = 0; _hidl_index < "
<< nameDeref
- << "size(); ++_aidl_index) {\n";
+ << "size(); ++_hidl_index) {\n";
out.indent();
mElementType->emitReaderWriterEmbedded(
out,
- (nameIsPointer ? "(*" + name + ")" : name) + "[_aidl_index]",
+ (nameIsPointer ? "(*" + name + ")" : name) + "[_hidl_index]",
false /* nameIsPointer */,
parcelObj,
parcelObjIsPointer,
isReader,
mode,
childName,
- "_aidl_index * sizeof(" + baseType + ")");
+ "_hidl_index * sizeof(" + baseType + ")");
out.unindent();