From fed12441ac85add9fc024b6e2554f015e29d380b Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Wed, 12 Apr 2017 09:39:54 -0700
Subject: [PATCH] libgrallocmapperincludes: as header lib and vendor

Bug: 33241851
Test: links
Test: try build with BOARD_VNDK_VERSION current, no errors related to
  this module
Test: (sanity) YouTube

Change-Id: Ia2c3922bf8bf1ab51396a8c8c5fa8d909c442994
---
 graphics/allocator/2.0/default/Android.bp | 4 +++-
 graphics/mapper/2.0/default/Android.bp    | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/graphics/allocator/2.0/default/Android.bp b/graphics/allocator/2.0/default/Android.bp
index 6adfa71f7b..4a7cfe08e8 100644
--- a/graphics/allocator/2.0/default/Android.bp
+++ b/graphics/allocator/2.0/default/Android.bp
@@ -15,7 +15,9 @@ cc_library_shared {
         "liblog",
         "libutils",
     ],
-    static_libs: ["libgrallocmapperincludes"],
+    header_libs: [
+        "libgrallocmapperincludes",
+    ],
 }
 
 cc_binary {
diff --git a/graphics/mapper/2.0/default/Android.bp b/graphics/mapper/2.0/default/Android.bp
index 090c61fb39..677d966113 100644
--- a/graphics/mapper/2.0/default/Android.bp
+++ b/graphics/mapper/2.0/default/Android.bp
@@ -16,7 +16,7 @@
 cc_library_shared {
     name: "android.hardware.graphics.mapper@2.0-impl",
     defaults: ["hidl_defaults"],
-    proprietary: true,
+    vendor: true,
     relative_install_path: "hw",
     srcs: ["GrallocMapper.cpp", "Gralloc0Mapper.cpp", "Gralloc1Mapper.cpp"],
     cppflags: ["-Wall", "-Wextra"],
@@ -33,7 +33,8 @@ cc_library_shared {
     ],
 }
 
-cc_library_static {
+cc_library_headers {
     name: "libgrallocmapperincludes",
+    vendor: true,
     export_include_dirs: ["."],
 }