1 files changed, 12 insertions, 5 deletions
diff --git a/libese/Android.bp b/libese/Android.bp
index 38f0a7c..8e2296c 100644
--- a/libese/Android.bp
+++ b/libese/Android.bp
@@ -32,13 +32,22 @@ cc_defaults {
     },
 }
 
+cc_library_headers {
+    name: "libese-api-headers",
+    host_supported: true,
+    proprietary: true,
+    export_include_dirs: ["include"],
+    visibility: ["//external/libese:__subpackages__"],
+}
+
 cc_defaults {
     name: "libese-api-defaults",
     defaults: ["libese-defaults"],
 
+    header_libs: ["libese-api-headers"],
+    export_header_lib_headers: ["libese-api-headers"],
+
     // Ensure that only explicitly exported symbols are visible.
-    local_include_dirs: ["include"],
-    export_include_dirs: ["include"],
     cflags: ["-fvisibility=internal"],
 }
 
@@ -52,10 +61,8 @@ cc_library {
         "ese_sg.c",
     ],
 
-    export_include_dirs: ["include"],
-
     shared_libs: ["libese-sysdeps", "liblog"],
-    export_shared_lib_headers: ["liblog"],
+    export_shared_lib_headers: ["libese-sysdeps", "liblog"],
 }
 
 subdirs = ["tests"]