diff options
| author | Ed Tam <etam@google.com> | 2015-04-13 23:37:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-13 23:37:52 +0000 |
| commit | d0b6de41f8b36df751962e28803db7a4375751ff (patch) | |
| tree | b1350343701dccd609de5b167199748145395b21 /init | |
| parent | 17b6a39f04c291c6002a22ec60eecdea51f86170 (diff) | |
| parent | 438443e742d9cfb91c1193144a3b41744ffad34b (diff) | |
| download | system_core-d0b6de41f8b36df751962e28803db7a4375751ff.zip system_core-d0b6de41f8b36df751962e28803db7a4375751ff.tar.gz system_core-d0b6de41f8b36df751962e28803db7a4375751ff.tar.bz2 | |
Merge "resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
Diffstat (limited to 'init')
| -rw-r--r-- | init/Android.mk | 4 | ||||
| -rw-r--r-- | init/devices.cpp | 2 | ||||
| -rw-r--r-- | init/util.cpp | 2 | ||||
| -rw-r--r-- | init/util.h | 2 |
4 files changed, 6 insertions, 4 deletions
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 @@ LOCAL_STATIC_LIBRARIES := \ libselinux \ libmincrypt \ libc++_static \ - libdl + libdl \ + libsparse_static \ + libz # Create symlinks LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \ 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 @@ static void handle_device(const char *action, const char *devpath, 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]); } } 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 sanitize(char *s) } } -void make_link(const char *oldpath, const char *newpath) +void make_link_init(const char *oldpath, const char *newpath) { int ret; char buf[256]; 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 @@ unsigned int decode_uid(const char *s); 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); |