commit 6611fedd1a568d258ee28b715d2b4f46854f037c
author Bill Yi <byi@google.com> Wed Oct 24 14:46:02 2018 -0700
committer Bill Yi <byi@google.com> Wed Oct 24 14:46:02 2018 -0700
tree d057aae9f5c9abf46d430b6acaf3ee022de74860
parent 4d7a726f7167f1b11e95fc416c675c75e7918e5e
parent 3384f24a8b7897f1c79b0cfd8695d87d4428444e

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I6087925e9eb08e04c52ac24cdd04bd7ed6070057

Android.bp

diff --git a/Android.bp b/Android.bp
index c71d35f..61709d6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@
     "-std=c++14",
     "-fexceptions",
     "-Wextra",
+    "-Wno-implicit-fallthrough",
+    // src/Unwind-EHABI.cpp line 97 and 100 have implicit fallthrough.
     "-Wno-unused-function",
     "-Wno-unused-parameter",
     "-Wno-unused-local-typedef",
@@ -50,6 +52,7 @@
     name: "libunwind_llvm",
     sdk_version: "21",
     vendor_available: true,
+    recovery_available: true,
     srcs: LIBUNWIND_SRC_FILES,
     include_dirs: LIBUNWIND_INCLUDES,
     local_include_dirs: LIBUNWIND_LOCAL_INCLUDES,
@@ -65,7 +68,4 @@
             enabled: true,
         },
     },
-    lto: {
-        never: true,
-    }
 }