Merge "tombstoned: don't bail out if we fail to unlink a file that isn't there."
diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index 8ce9dfc..1b13b21 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -232,7 +232,7 @@
{"shutdown,thermal,battery", 87},
{"reboot,its_just_so_hard", 88}, // produced by boot_reason_test
{"reboot,Its Just So Hard", 89}, // produced by boot_reason_test
- // {"usb", 90}, // Duplicate of enum 80 above. Immediate reuse possible.
+ {"reboot,rescueparty", 90},
{"charge", 91},
{"oem_tz_crash", 92},
{"uvlo", 93},
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",
],
