commit 5ee3219b02b84c43e84ded15b5cf6a3873646871
author Christopher Ferris <cferris@google.com> Tue Mar 08 19:05:03 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 08 19:05:03 2016 +0000
tree 1fde3a02cad894d46e102b0a6ec4b078350aceeb
parent 2c9561e32c7402e80ecf867242df23ac05ebac82
parent 936e80b1ede36884588abe481406d73344826d5b

Merge "Do not try non-dwarf local unwinds for x86."

Android.bp

diff --git a/Android.bp b/Android.bp
index 4fcbd7d..83045a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,8 +24,9 @@
 ]
 
 libunwind_common_cflags = [
-    "-Wno-unused-parameter",
     "-Werror",
+    "-Wno-#pragma-messages",
+    "-Wno-unused-parameter",
 ]
 
 // gcc 4.8 appears to be overeager declaring that a variable is uninitialized,
@@ -381,7 +382,6 @@
     },
 
     export_include_dirs: ["include"],
-    stl: "none",
 
     shared_libs: ["liblzma"],
 
@@ -438,7 +438,6 @@
     },
 
     whole_static_libs: ["libunwind"],
-    stl: "none",
 }
 
 /*