Merge "Revert "bootstat: Handle v1 record files which do not contain file contents."" into nyc-dev
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp
index 842bf09..12f507a 100644
--- a/debuggerd/debuggerd.cpp
+++ b/debuggerd/debuggerd.cpp
@@ -415,6 +415,7 @@
#ifdef SIGSTKFLT
case SIGSTKFLT:
#endif
+ case SIGSYS:
case SIGTRAP:
ALOGV("stopped -- fatal signal\n");
*crash_signal = signal;
diff --git a/liblog/Android.bp b/liblog/Android.bp
index ee883f0..9e8491b 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -14,20 +14,30 @@
// limitations under the License.
//
-liblog_host_sources = [
- "logd_write.c",
+liblog_sources = [
+ "log_event_list.c",
"log_event_write.c",
+ "logger_write.c",
+ "config_write.c",
+ "logger_name.c",
+ "logger_lock.c",
+]
+liblog_host_sources = [
"fake_log_device.c",
//"event.logtags",
+ "fake_writer.c",
]
liblog_target_sources = [
- "logd_write.c",
- "log_event_write.c",
"event_tag_map.c",
+ "config_read.c",
"log_time.cpp",
"log_is_loggable.c",
"logprint.c",
- "log_read.c",
+ "pmsg_reader.c",
+ "pmsg_writer.c",
+ "logd_reader.c",
+ "logd_writer.c",
+ "logger_read.c",
]
// Shared and static library for host and device
@@ -36,6 +46,8 @@
name: "liblog",
host_supported: true,
+ srcs: liblog_sources,
+
target: {
host: {
srcs: liblog_host_sources,
@@ -64,6 +76,7 @@
cflags: [
"-Werror",
+ "-fvisibility=hidden",
// This is what we want to do:
// liblog_cflags := $(shell \
// sed -n \
@@ -71,7 +84,6 @@
// $(LOCAL_PATH)/event.logtags)
// so make sure we do not regret hard-coding it as follows:
"-DLIBLOG_LOG_TAG=1005",
- "-DSNET_EVENT_LOG_TAG=1397638484",
],
compile_multilib: "both",
stl: "none",