Merge change Iab9ad144
* changes:
Add back missing libdl in linker command. The executables here contain call to function defined in libdl.so but the library is missing the linker commands. Currently, the library is linked via dependency of another library. While this works, it is not the right thing to do.
diff --git a/init/builtins.c b/init/builtins.c
index 1e7cb4e..b4af700 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -459,7 +459,7 @@
if ((fd1 = open(args[1], O_RDONLY)) < 0)
goto out_err;
- if ((fd2 = open(args[2], O_WRONLY|O_CREAT, 0660)) < 0)
+ if ((fd2 = open(args[2], O_WRONLY|O_CREAT|O_TRUNC, 0660)) < 0)
goto out_err;
if (!(buffer = malloc(info.st_size)))
diff --git a/logcat/event-log-tags b/logcat/event-log-tags
index fcb2708..a8b044e 100644
--- a/logcat/event-log-tags
+++ b/logcat/event-log-tags
@@ -120,6 +120,7 @@
2824 backup_package (Package|3),(Size|1|2)
2825 backup_success (Packages|1|1),(Time|1|3)
2826 backup_reset (Transport|3)
+2827 backup_initialize
2830 restore_start (Transport|3),(Source|2|5)
2831 restore_transport_failure
@@ -292,6 +293,7 @@
75001 sqlite_mem_alarm_max (max|1|2)
75002 sqlite_mem_alarm_alloc_attempt (attempts|1|4)
75003 sqlite_mem_released (Memory released|1|2)
+75004 sqlite_db_corrupt (Database file corrupt|3)
40000 checkin (Check in time|2|3)