From e6b011348245a212a62088aaa57cbe931fecc1c2 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Tue, 14 Dec 2021 22:26:48 +0900
Subject: 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
---
 Android.bp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

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",
-- 
cgit v1.2.3


From ff95f5436627c3640f88049175d3fe0d0937305d Mon Sep 17 00:00:00 2001
From: Roopa Sattiraju <sattiraju@google.com>
Date: Wed, 22 Dec 2021 16:04:31 -0800
Subject: Adding  min_sdk fields to compile with Bluetooth Apex

Bug: 206121418
Test: Compile
Change-Id: Ief1f5d1b15cea44d25a11b9b679259a1134b399b
---
 Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Android.bp b/Android.bp
index 32eed33f..cde68227 100644
--- a/Android.bp
+++ b/Android.bp
@@ -106,6 +106,7 @@ cc_library_static {
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
+    min_sdk_version: "29",
 }
 
 cc_library_static {
-- 
cgit v1.2.3


From be3d771f0c36f0b3d913236a5db75c0f2b997340 Mon Sep 17 00:00:00 2001
From: Florian Mayer <fmayer@google.com>
Date: Thu, 17 Mar 2022 01:17:57 +0000
Subject: Add fmtlib to hwasan-postsubmit.

Change-Id: I1610f11b79f1d5e612c95d9ac7467e3b5f6303ac
Test: Run tests under HWASan.
Bug: 193568145
---
 TEST_MAPPING | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index caeecd64..328028d6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -6,5 +6,13 @@
     {
       "name": "fmtlib_ostream_test"
     }
+  ],
+  "hwasan-postsubmit": [
+    {
+      "name": "fmtlib_test"
+    },
+    {
+      "name": "fmtlib_ostream_test"
+    }
   ]
 }
-- 
cgit v1.2.3