From b2b88e35eadc9b5c6f0b61d2dd025a725bb85980 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 30 Jun 2017 12:46:57 -0700
Subject: [PATCH] Move libnativebridge headers into the module.

Test: links
Change-Id: I2e19d1ba7845b4b3d3fee934fcb1c90151fd7192
---
 libnativebridge/Android.bp                            | 11 ++++++++++-
 .../include}/nativebridge/native_bridge.h             |  0
 libnativebridge/tests/Android.bp                      |  1 +
 3 files changed, 11 insertions(+), 1 deletion(-)
 rename {include => libnativebridge/include}/nativebridge/native_bridge.h (100%)

diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index 377b7dd1e..1cea4cd39 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -1,4 +1,11 @@
 
+cc_library_headers {
+    name: "libnativebridge-dummy-headers",
+
+    host_supported: true,
+    export_include_dirs=["include"],
+}
+
 cc_library {
     name: "libnativebridge",
 
@@ -7,6 +14,8 @@ cc_library {
     shared_libs: ["liblog"],
     clang: true,
 
+    export_include_dirs=["include"],
+
     cflags: [
         "-Werror",
         "-Wall",
@@ -23,4 +32,4 @@ cc_library {
     },
 }
 
-subdirs = ["tests"]
\ No newline at end of file
+subdirs = ["tests"]
diff --git a/include/nativebridge/native_bridge.h b/libnativebridge/include/nativebridge/native_bridge.h
similarity index 100%
rename from include/nativebridge/native_bridge.h
rename to libnativebridge/include/nativebridge/native_bridge.h
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp
index efd397895..e31dae086 100644
--- a/libnativebridge/tests/Android.bp
+++ b/libnativebridge/tests/Android.bp
@@ -23,6 +23,7 @@ cc_defaults {
         "-Wextra",
         "-Werror",
     ],
+    header_libs: ["libnativebridge-dummy-headers"],
     cppflags: ["-fvisibility=protected"],
     target: {
         android: {