From 2d0dc9966a05e1bb967e5cd760338edd339fe368 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Wed, 12 Apr 2017 18:57:57 -0700
Subject: [PATCH 1/3] libutils: export system_headers

vendor + vendor_available modules built with BOARD_VNDK_VERSION :=
current aren't allowed to use global headers. Since libutils uses
system headers itself, it should export them as well.

Bug: 33241851
Test: building with BOARD_VNDK_VERSION := current produces many fewer
errors.

Change-Id: Icc7d2beb2a17da291434c6282eb1b9eb458f114c
Merged-In: I950821f1dae3ddc110db50869247913d5b1aa638
---
 libsystem/Android.bp | 11 +++++++++++
 libutils/Android.bp  |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/libsystem/Android.bp b/libsystem/Android.bp
index 4d076d538..846a58526 100644
--- a/libsystem/Android.bp
+++ b/libsystem/Android.bp
@@ -1,4 +1,15 @@
 cc_library_headers {
     name: "libsystem_headers",
+    vendor_available: true,
+    host_supported: true,
     export_include_dirs: ["include"],
+
+    target: {
+        linux_bionic: {
+            enabled: true,
+        },
+        windows: {
+            enabled: true,
+        },
+    }
 }
diff --git a/libutils/Android.bp b/libutils/Android.bp
index b46ad6226..83b2682f6 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -16,6 +16,9 @@ cc_library_headers {
     name: "libutils_headers",
     vendor_available: true,
     host_supported: true,
+
+    header_libs: ["libsystem_headers",],
+    export_header_lib_headers: ["libsystem_headers",],
     export_include_dirs: ["include"],
     target: {
         linux_bionic: {

From 4ad9d5155b530912c8bb50a6e19c5e312ef3427a Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Thu, 13 Apr 2017 21:01:40 -0700
Subject: [PATCH 2/3] libutils: export libbacktrace headers

This is used in CallStack.h.

Test: m -j libutils
Test: links
Test: trying to compile with BOARD_VNDK_VERSION := current
Bug: 33241851
Change-Id: I076c9551d356824d6e69b82349b890369bc7eea3
Merged-In: If7258e7b38000a72fd520f725030fb0038f90167
---
 libbacktrace/Android.bp | 1 +
 libutils/Android.bp     | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 4a525be97..285aa6edf 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -57,6 +57,7 @@ libbacktrace_sources = [
 
 cc_library_headers {
     name: "libbacktrace_headers",
+    vendor_available: true,
     export_include_dirs: ["include"],
 }
 
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 83b2682f6..e912ad237 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -20,7 +20,12 @@ cc_library_headers {
     header_libs: ["libsystem_headers",],
     export_header_lib_headers: ["libsystem_headers",],
     export_include_dirs: ["include"],
+
     target: {
+        android: {
+            header_libs: ["libbacktrace_headers"],
+            export_header_lib_headers: ["libbacktrace_headers"],
+        },
         linux_bionic: {
             enabled: true,
         },

From 1e8ac0fd03660d5d03103b2a7f36a8d0cfb6a379 Mon Sep 17 00:00:00 2001
From: Jaesoo Lee <jaesoo@google.com>
Date: Thu, 20 Apr 2017 16:56:45 +0900
Subject: [PATCH 3/3] libutils_headers: export libcutils_headers

These headers are used in headers in libutils_headers and must be
re-exported.

include/utils/Atomic.h:20:#include <cutils/atomic.h>
include/utils/Trace.h:24:#include <cutils/trace.h>
include/utils/Singleton.h:27:#include <cutils/compiler.h>

Test: modules using libutils_headers don't have to have
libcutils_headers include dirs set.
Bug: 33241851

Change-Id: I039aaaad93bf0944d42f04d2a9e6654b4f867042
---
 libutils/Android.bp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libutils/Android.bp b/libutils/Android.bp
index e912ad237..33770ba03 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -17,8 +17,14 @@ cc_library_headers {
     vendor_available: true,
     host_supported: true,
 
-    header_libs: ["libsystem_headers",],
-    export_header_lib_headers: ["libsystem_headers",],
+    header_libs: [
+        "libsystem_headers",
+        "libcutils_headers"
+    ],
+    export_header_lib_headers: [
+        "libsystem_headers",
+        "libcutils_headers"
+    ],
     export_include_dirs: ["include"],
 
     target: {