commit ab89e388a734da3c3aa43766c0ac26dafc7306d7
author Dan Willemsen <dwillemsen@google.com> Wed Sep 20 23:33:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 20 23:33:33 2017 +0000
tree 0c1e1352f285b4a15ce94b888e7cba91540f722d
parent a02b759cb0dae1286fa1e83f12d59d03947356c6
parent dc60cdc5d2ec6dec55478ce819e1a82a9a144841

Merge "Enable libdemangle and libunwindstack on host bionic"
am: 65673033ab

Change-Id: I27b45ee054f23c0c42b265d3f5dc01ab7c9e8905

demangle/Android.bp

diff --git a/demangle/Android.bp b/demangle/Android.bp
index e55c886..89b8772 100644
--- a/demangle/Android.bp
+++ b/demangle/Android.bp
@@ -24,6 +24,12 @@
         "-Werror",
         "-Wextra",
     ],
+
+    target: {
+        linux_bionic: {
+            enabled: true,
+        },
+    },
 }
 
 cc_library {

libunwindstack/Android.bp

diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 32ba692..e1957ca 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -29,6 +29,9 @@
         darwin: {
             enabled: false,
         },
+        linux_bionic: {
+            enabled: true,
+        },
     },
 }