commit 570cd46d14645f622e9972671308fdb4f2425292
author Dan Albert <danalbert@google.com> Fri May 30 20:13:48 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 30 20:13:48 2014 +0000
tree 5c60de57cb244e6f371415313243e42457855744
parent 9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6
parent 7bc49a16e80bd6306fc467e27c019aa72b9a2701

Merge "Revert "Move libutils to libc++""

libutils/String16.cpp

diff --git a/libutils/String16.cpp b/libutils/String16.cpp
index b09b728..3bdc349 100644
--- a/libutils/String16.cpp
+++ b/libutils/String16.cpp
@@ -16,7 +16,6 @@
 
 #include <utils/String16.h>
 
-#include <utils/Debug.h>
 #include <utils/Log.h>
 #include <utils/Unicode.h>
 #include <utils/String8.h>

rootdir/init.environ.rc.in

diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in
index 927c33d..1f964e3 100644
--- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in
@@ -9,3 +9,4 @@
     export ASEC_MOUNTPOINT /mnt/asec
     export LOOP_MOUNTPOINT /mnt/obb
     export BOOTCLASSPATH %BOOTCLASSPATH%
+    export LD_PRELOAD libsigchain.so