From 8f56c1ecd71dc142b3fd02826ba4e8b37485c1d0 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 14 Apr 2017 00:54:46 -0700
Subject: [PATCH] libbase: add libbase_headers

Test: can include headers in other soong modules
Bug: 33241851
Change-Id: Ie3d11d1559f5aae46125695fd1f3a63da8e429ae
---
 base/Android.bp | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/base/Android.bp b/base/Android.bp
index 7b1dc8e36..e18c47ec1 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -20,6 +20,25 @@ libbase_cppflags = [
     "-Werror",
 ]
 
+cc_library_headers {
+    name: "libbase_headers",
+    vendor_available: true,
+    host_supported: true,
+    export_include_dirs: ["include"],
+
+    header_libs: ["libutils_headers"],
+    export_header_lib_headers: ["libutils_headers"],
+
+    target: {
+        linux_bionic: {
+            enabled: true,
+        },
+        windows: {
+            enabled: true,
+        },
+    },
+}
+
 cc_library {
     name: "libbase",
     clang: true,
@@ -33,9 +52,11 @@ cc_library {
         "strings.cpp",
         "test_utils.cpp",
     ],
-    local_include_dirs: ["include"],
+
+    header_libs: ["libbase_headers"],
+    export_header_lib_headers: ["libbase_headers"],
+
     cppflags: libbase_cppflags,
-    export_include_dirs: ["include"],
     shared_libs: ["liblog"],
     target: {
         android: {