From 13c24a6fed1ab02ee60f5cde8904e7e260583221 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 12 Nov 2020 14:56:12 +0000
Subject: Move the async_safe dependency to bionic.

Test: ./art/test/testrunner/run_build_test_target.py -j80 art-linux-bionic-x64-zipapex
Change-Id: I9b3be2433dce4af3ebb912b34816a57b16882fd7
---
 libunwindstack/Android.bp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'libunwindstack/Android.bp')

diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 1e544a3..35dcaba 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -85,7 +85,7 @@ cc_defaults {
                 "-g",
             ],
         },
-        android: {
+        bionic: {
             header_libs: ["bionic_libc_platform_headers"],
             product_variables: {
                 experimental_mte: {
@@ -94,14 +94,6 @@ cc_defaults {
             },
             static_libs: ["libasync_safe"],
         },
-        linux_bionic: {
-            header_libs: ["bionic_libc_platform_headers"],
-            product_variables: {
-                experimental_mte: {
-                    cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
-                },
-            },
-        },
     },
 
     arch: {
-- 
cgit v1.2.3