commit 438443e742d9cfb91c1193144a3b41744ffad34b
author Ed Tam <etam@google.com> Mon Apr 13 16:29:05 2015 -0700
committer Ed Tam <etam@google.com> Mon Apr 13 16:29:05 2015 -0700
tree 2e7c3c910aebf933d713d047218fc46c5296e269
parent 51c6ad178e723a4cd59a143dd48d81ccdce2d489
parent 79f338465213885900cea5a39f3aeeea083bbe51

resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp

Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 4bd4f3d..31d2fcd 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -69,7 +69,9 @@
     libselinux \
     libmincrypt \
     libc++_static \
-    libdl
+    libdl \
+    libsparse_static \
+    libz
 
 # Create symlinks
 LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index 96b1696..5ca855f 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -540,7 +540,7 @@
         make_device(devpath, path, block, major, minor, (const char **)links);
         if (links) {
             for (i = 0; links[i]; i++)
-                make_link(devpath, links[i]);
+                make_link_init(devpath, links[i]);
         }
     }
 

init/util.cpp

diff --git a/init/util.cpp b/init/util.cpp
index 3b49b30..c0be38f 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -325,7 +325,7 @@
     }
 }
 
-void make_link(const char *oldpath, const char *newpath)
+void make_link_init(const char *oldpath, const char *newpath)
 {
     int ret;
     char buf[256];

init/util.h

diff --git a/init/util.h b/init/util.h
index 8fec7a8..dfb1d9d 100644
--- a/init/util.h
+++ b/init/util.h
@@ -53,7 +53,7 @@
 
 int mkdir_recursive(const char *pathname, mode_t mode);
 void sanitize(char *p);
-void make_link(const char *oldpath, const char *newpath);
+void make_link_init(const char *oldpath, const char *newpath);
 void remove_link(const char *oldpath, const char *newpath);
 int wait_for_file(const char *filename, int timeout);
 void open_devnull_stdio(void);