hidl-gen: Android.bp, include indirect libraries.
am: ff5262be9f
Change-Id: I18508d7b0ebd4db3e9f02b8547c37bbfe3babbb9
diff --git a/main.cpp b/main.cpp
index ea317a7..bdecb4c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -665,7 +665,7 @@
return err;
}
- std::set<FQName> importedPackages;
+ std::set<FQName> importedPackagesHierarchy;
AST *typesAST = nullptr;
for (const auto &fqName : packageInterfaces) {
@@ -683,7 +683,7 @@
typesAST = ast;
}
- ast->getImportedPackages(&importedPackages);
+ ast->getImportedPackagesHierarchy(&importedPackagesHierarchy);
}
std::string path =
@@ -734,7 +734,7 @@
genSourceName,
"c++",
packageInterfaces,
- importedPackages,
+ importedPackagesHierarchy,
[&pathPrefix](Formatter &out, const FQName &fqName) {
if (fqName.name() == "types") {
out << "\"" << pathPrefix << "types.cpp\",\n";
@@ -753,7 +753,7 @@
genHeaderName,
"c++",
packageInterfaces,
- importedPackages,
+ importedPackagesHierarchy,
[&pathPrefix](Formatter &out, const FQName &fqName) {
out << "\"" << pathPrefix << fqName.name() << ".h\",\n";
if (fqName.name() != "types") {
@@ -780,7 +780,7 @@
<< "\"liblog\",\n"
<< "\"libutils\",\n"
<< "\"libcutils\",\n";
- for (const auto &importedPackage : importedPackages) {
+ for (const auto &importedPackage : importedPackagesHierarchy) {
out << "\"" << makeLibraryName(importedPackage) << "\",\n";
}
out.unindent();
@@ -793,7 +793,7 @@
<< "\"libhidltransport\",\n"
<< "\"libhwbinder\",\n"
<< "\"libutils\",\n";
- for (const auto &importedPackage : importedPackages) {
+ for (const auto &importedPackage : importedPackagesHierarchy) {
out << "\"" << makeLibraryName(importedPackage) << "\",\n";
}
out.unindent();