summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-10-17 10:05:10 -0700
committerKenny Root <kroot@google.com>2012-10-17 10:06:17 -0700
commited3ce513a64b9f26358dc77187d6d04fe91abae9 (patch)
tree64b2ae7ec46052473888beaa764fb4b275cd89e5
parentad0090e7b8c70cf44609aafbfea8c3946e2802a9 (diff)
downloadframeworks_base-ed3ce513a64b9f26358dc77187d6d04fe91abae9.zip
frameworks_base-ed3ce513a64b9f26358dc77187d6d04fe91abae9.tar.gz
frameworks_base-ed3ce513a64b9f26358dc77187d6d04fe91abae9.tar.bz2
Fix bad merge
Change-Id: I9f05f96e3607b994368a8d4e1e454af8fe84424d
-rw-r--r--cmds/installd/commands.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 902463d..2c30ec7 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -71,8 +71,8 @@ int install(const char *pkgname, uid_t uid, gid_t gid)
return -1;
}
- if (selinux_android_setfilecon(libdir, pkgname, uid) < 0) {
- ALOGE("cannot setfilecon dir '%s': %s\n", libdir, strerror(errno));
+ if (selinux_android_setfilecon(libsymlink, pkgname, uid) < 0) {
+ ALOGE("cannot setfilecon dir '%s': %s\n", libsymlink, strerror(errno));
unlink(libsymlink);
unlink(pkgdir);
return -1;