commit b50d0cd53f94b0c654e007464ec32396b0cb1aef
author Arve Hjønnevåg <arve@android.com> Mon Oct 20 21:53:58 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 20 21:53:59 2014 +0000
tree 281c1d57847f2984a4b2ec4caaf5c089b349aba3
parent a0a7ac037dd998168fa56d76e9c27bfda1c6a41e
parent 7770252a84a0981d0e6b3d1b03376ddbecff9654

Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-dev

liblog/logd_write.c

diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index 3659676..b2668ce 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -58,7 +58,6 @@
 #endif
 
 #if FAKE_LOG_DEVICE
-#define WEAK __attribute__((weak))
 static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1, -1 };
 #else
 static int logd_fd = -1;
@@ -274,7 +273,7 @@
     [LOG_ID_CRASH] = "crash"
 };
 
-const WEAK char *android_log_id_to_name(log_id_t log_id)
+const char *android_log_id_to_name(log_id_t log_id)
 {
     if (log_id >= LOG_ID_MAX) {
         log_id = LOG_ID_MAIN;

rootdir/init.environ.rc.in

diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in
index 67222d7..30bef46 100644
--- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in
@@ -10,4 +10,3 @@
     export LOOP_MOUNTPOINT /mnt/obb
     export BOOTCLASSPATH %BOOTCLASSPATH%
     export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH%
-    export LD_PRELOAD libsigchain.so