Merge "Enable libdemangle and libunwindstack on host bionic"

am: 65673033ab Change-Id: I27b45ee054f23c0c42b265d3f5dc01ab7c9e8905
2017-09-20 23:33:33 +00:00 · 2017-09-20 23:33:33 +00:00 · e529e49262
parent af37a3e77a 65673033ab
commit e529e49262
2 changed files with 9 additions and 0 deletions
--- a/demangle/Android.bp
+++ b/demangle/Android.bp
@ -24,6 +24,12 @@ cc_defaults {
        "-Werror",
        "-Wextra",
    ],
+
+    target: {
+        linux_bionic: {
+            enabled: true,
+        },
+    },
 }

 cc_library {
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@ -29,6 +29,9 @@ cc_defaults {
        darwin: {
            enabled: false,
        },
+        linux_bionic: {
+            enabled: true,
+        },
    },
 }