Snap for 8730993 from 1138f5110652e173ff33e03ccf84988b3ea2e168 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: I4fb68b82bf54642133a0746ade994fbb1d129348

2 files changed, 0 insertions, 36 deletions

diff --git a/Android.bp b/Android.bp
index cde68227..b5341cf6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,33 +55,6 @@ 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",
@@ -106,7 +79,6 @@ cc_library_static {
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
-    min_sdk_version: "29",
 }
 
 cc_library_static {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 328028d6..caeecd64 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -6,13 +6,5 @@
     {
       "name": "fmtlib_ostream_test"
     }
-  ],
-  "hwasan-postsubmit": [
-    {
-      "name": "fmtlib_test"
-    },
-    {
-      "name": "fmtlib_ostream_test"
-    }
   ]
 }