Snap for 8564071 from 9a0b209f2f97a4c7d425225e3e029cddaf64d9b3 to mainline-os-statsd-release
Change-Id: I73d10fce1f53738939631e633e856811cf788bb4
diff --git a/Android.bp b/Android.bp
index b5341cf..cde6822 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,6 +55,33 @@
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",
@@ -79,6 +106,7 @@
"//apex_available:anyapex",
"//apex_available:platform",
],
+ min_sdk_version: "29",
}
cc_library_static {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index caeecd6..328028d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -6,5 +6,13 @@
{
"name": "fmtlib_ostream_test"
}
+ ],
+ "hwasan-postsubmit": [
+ {
+ "name": "fmtlib_test"
+ },
+ {
+ "name": "fmtlib_ostream_test"
+ }
]
}