Define fmtlib_headers

fmblib is statically linked to libbase. However, its headers were not
re-exported from libbase_headers. This in turn has prevented users of
libbase_headers from using android-base/result.h which transitively
includes headers from fmblit.

To fix this, define fmtlib_headers and let libbase_headers re-export it.
fmtlib_headers still considered as part of libbase. Therefore, it's only
visible to system/libbase.

Bug: 209929099
Test: m
Change-Id: I4e568a0e08c1255f88ac52c58e7897abe252a4ee

1 files changed, 27 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index b5341cf6..32eed33f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,6 +55,33 @@ cc_defaults {
     min_sdk_version: "29",
 }
 
+cc_library_headers {
+    name: "fmtlib_headers",
+    export_include_dirs: ["include"],
+
+    vendor_available: true,
+    product_available: true,
+    ramdisk_available: true,
+    vendor_ramdisk_available: true,
+    recovery_available: true,
+    host_supported: true,
+    native_bridge_supported: true,
+    target: {
+        linux_bionic: {
+            enabled: true,
+        },
+        windows: {
+            enabled: true,
+        },
+    },
+    visibility: ["//system/libbase"],
+    min_sdk_version: "29",
+    apex_available: [
+        "//apex_available:anyapex",
+        "//apex_available:platform",
+    ],
+}
+
 // This is built into libbase.  If you want to use this library, link to libbase instead.
 cc_library_static {
     name: "fmtlib",