commit 0e875df3c2b6a2edf96dff550a376c897ca405c0
author Steven Moreland <smoreland@google.com> Tue Apr 25 13:24:17 2017 -0700
committer Steven Moreland <smoreland@google.com> Mon May 01 17:13:44 2017 +0000
tree 0a6ff39fdd2d47271ce47a7f762b999aa8d5c517
parent 8923db91cb969a2d86d9025f88fb8fe6db0ee0d4

Vendor extension hals on the vendor image.

This is required to make sure

Test: running hidl-gen on vendor image, image built to vendor
Test: update-makefiles is no-op on:
  hardware/interfaces
  frameworks/hardware/interfaces
  system/hardware/interfaces
  system/libhidl/transport
Bug: 35813011

(cherry picked from commit ec642438e32309b694a4b3303f8c5a6a524dda20)
Merged-In: Ie3f4aef0f9088c09c108030084e71d5921599c4d
Change-Id: Ie3f4aef0f9088c09c108030084e71d5921599c4d

main.cpp

diff --git a/main.cpp b/main.cpp
index 003a0cb..d786738 100644
--- a/main.cpp
+++ b/main.cpp
@@ -785,9 +785,20 @@
     out << "name: \"" << libraryName << "\",\n"
         << "generated_sources: [\"" << genSourceName << "\"],\n"
         << "generated_headers: [\"" << genHeaderName << "\"],\n"
-        << "export_generated_headers: [\"" << genHeaderName << "\"],\n"
-        << "vendor_available: true,\n"
-        << "shared_libs: [\n";
+        << "export_generated_headers: [\"" << genHeaderName << "\"],\n";
+
+    // TODO(b/35813011): make always vendor_available
+    // Explicitly mark libraries vendor until BOARD_VNDK_VERSION can
+    // be enabled.
+    if (packageFQName.inPackage("android.hidl") ||
+            packageFQName.inPackage("android.system") ||
+            packageFQName.inPackage("android.frameworks") ||
+            packageFQName.inPackage("android.hardware")) {
+        out << "vendor_available: true,\n";
+    } else {
+        out << "vendor: true,\n";
+    }
+    out << "shared_libs: [\n";
 
     out.indent();
     out << "\"libhidlbase\",\n"