commit 6a3c05bcfab588fd99dd8d619a53d15374e99507
author Mathias Agopian <mathias@google.com> Thu Apr 27 20:06:55 2017 -0700
committer Mathias Agopian <mathias@google.com> Tue May 09 16:42:31 2017 -0700
tree 30e5edaa74ea3dff07579a5a9cd39f1755069eb3
parent 37c27efdf8232272648e56513f3caceeb5c66407

fix circular dependency libnativewindow <-> libui

Bug: 37647680
Bug: 37648355
Test: compile, manual
Change-Id: I9631beea52e23ebb519411f943c6f5062aedd2e5

libs/vr/libbufferhub/Android.bp

diff --git a/libs/vr/libbufferhub/Android.bp b/libs/vr/libbufferhub/Android.bp
index 452bad0..da0ea24 100644
--- a/libs/vr/libbufferhub/Android.bp
+++ b/libs/vr/libbufferhub/Android.bp
@@ -34,6 +34,11 @@
     "liblog",
     "libui",
     "libutils",
+    "libnativewindow"
+]
+
+HeaderLibraries = [
+    "libnativebase_headers",
 ]
 
 cc_library {
@@ -45,7 +50,11 @@
     export_include_dirs: localIncludeFiles,
     static_libs: staticLibraries,
     shared_libs: sharedLibraries,
+    header_libs: HeaderLibraries,
     name: "libbufferhub",
+    export_header_lib_headers: [
+        "libnativebase_headers",
+    ],
 }
 
 cc_test {