commit aecfa0c46dbbdd6e28af2f854920a80c652849de
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:37:17 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:37:17 2022 +0000
tree 7ded61f3cfe322fe4706181e50b2f28b35d8a4a0
parent e2f12a7236d14178ac61a4914faa9fc01101fb22
parent 0cbe0156ef389ae56254a55c909c3da03b72616c

Snap for 8730993 from 0cbe0156ef389ae56254a55c909c3da03b72616c to mainline-tzdata3-release

Change-Id: Ibfbfc5e95b7debf710c45149212ca4368469aa8e

Android.bp

diff --git a/Android.bp b/Android.bp
index 8fe656e..ba814eb 100755
--- a/Android.bp
+++ b/Android.bp
@@ -56,14 +56,10 @@
     ],
 
     stl: "none",
-    target: {
-        bionic: {
-            static: {
-                system_shared_libs: [],
-            },
-            header_libs: ["libc_headers"],
-        },
+    static: {
+        system_shared_libs: [],
     },
+    header_libs: ["libc_headers"],
 }
 
 cc_library_static {

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 75ec323..66bdc01 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -6,13 +6,5 @@
     {
       "name": "arm-optimized-routines-tests"
     }
-  ],
-  "hwasan-postsubmit": [
-    {
-      "name": "CtsBionicTestCases"
-    },
-    {
-      "name": "arm-optimized-routines-tests"
-    }
   ]
 }