commit 6f9090ba4a61c14a66479e8f183e829b7d5228ec
author Christopher Ferris <cferris@google.com> Thu May 03 16:17:08 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 03 16:17:08 2018 -0700
tree 2a243cbf33be36b6c3e12dc7353af842bb448e61
parent 834073674c72ada14b55b5316a7cad2275942b2f
parent bb0b333eb73929c304f74882e3d97c5f9d05d3ef

Merge "Remove unnecessary references to libunwind." am: c5943fd3fa
am: 08e5b5cba6

Change-Id: Ie86bdf7abbf2971a3646b845b50b522b7d4c2308

libbacktrace/Android.bp

diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index f38b7a2..11b8144 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -22,11 +22,6 @@
         "-Werror",
     ],
 
-    // The latest clang (r230699) does not allow SP/PC to be declared in inline asm lists.
-    clang_cflags: ["-Wno-inline-asm"],
-
-    include_dirs: ["external/libunwind/include/tdep"],
-
     target: {
         darwin: {
             enabled: false,
@@ -92,7 +87,6 @@
             shared_libs: [
                 "libbase",
                 "liblog",
-                "libunwind",
                 "libunwindstack",
                 "libdexfile",
             ],