commit 1b2167b9fbbfefe95959477ab056a15cf186b53a
author Steven Moreland <smoreland@google.com> Mon May 01 10:06:21 2017 -0700
committer Steven Moreland <smoreland@google.com> Mon May 01 18:11:29 2017 +0000
tree 53840bb1e4197bc2697cdc664e4ed56faa5be429
parent 0e875df3c2b6a2edf96dff550a376c897ca405c0

Remove redundant dependencies

android.hidl.base@1.0 and android.hidlmanager@1.0 are built into libhidltransport.

Test: manually inspect updated makefiles, targets link
Bug: 33276472
Change-Id: I48a47624f8060e180a78993cf4a6b3d5c9de17b2

main.cpp

diff --git a/main.cpp b/main.cpp
index d786738..5515519 100644
--- a/main.cpp
+++ b/main.cpp
@@ -658,6 +658,11 @@
     out << "}\n\n";
 }
 
+bool isHidlTransportPackage(const FQName &package) {
+    return package == gIBasePackageFqName ||
+           package == gIManagerPackageFqName;
+}
+
 static status_t generateAndroidBpForPackage(
         const FQName &packageFQName,
         const char *hidl_gen,
@@ -808,6 +813,10 @@
         << "\"libutils\",\n"
         << "\"libcutils\",\n";
     for (const auto &importedPackage : importedPackagesHierarchy) {
+        if (isHidlTransportPackage(importedPackage)) {
+            continue;
+        }
+
         out << "\"" << makeLibraryName(importedPackage) << "\",\n";
     }
     out.unindent();
@@ -821,6 +830,10 @@
         << "\"libhwbinder\",\n"
         << "\"libutils\",\n";
     for (const auto &importedPackage : importedPackagesHierarchy) {
+        if (isHidlTransportPackage(importedPackage)) {
+            continue;
+        }
+
         out << "\"" << makeLibraryName(importedPackage) << "\",\n";
     }
     out.unindent();