commit ff5262be9f7a9133d2fb135f9c8717444c00056d
author Steven Moreland <smoreland@google.com> Mon Mar 20 06:59:03 2017 -0700
committer Steven Moreland <smoreland@google.com> Mon Mar 20 07:07:18 2017 -0700
tree 08424bdfb02416992ac177c4d6f8c8c4fd816961
parent d4b068ab09b325e1a96c3b78c0c98164cc2856ff

hidl-gen: Android.bp, include indirect libraries.

Test: hidl_test, versioning builds, update-makefiles.sh
Bug: 36162559
Change-Id: I4fb628fda976c979678d33413aead03ac46ecdfe

main.cpp

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();