diff options
| author | Kenny Root <kroot@google.com> | 2012-10-16 17:49:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-16 17:49:23 -0700 |
| commit | a0d9ddb8f2922088b08219326afeaf532b3af5ac (patch) | |
| tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad /minzip/Zip.c | |
| parent | 2b44a5632613fc99671dae50c5e32f3dbc2aeaa7 (diff) | |
| parent | cd74108cdac228e946ca8b6ea2ff11ab62941a6d (diff) | |
| download | bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.zip bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.gz bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.bz2 | |
am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp
* commit 'cd74108cdac228e946ca8b6ea2ff11ab62941a6d':
Remove HAVE_SELINUX guards
Diffstat (limited to 'minzip/Zip.c')
| -rw-r--r-- | minzip/Zip.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c index 54d5d55..c87f038 100644 --- a/minzip/Zip.c +++ b/minzip/Zip.c @@ -1115,23 +1115,19 @@ bool mzExtractRecursive(const ZipArchive *pArchive, * Open the target for writing. */ -#ifdef HAVE_SELINUX char *secontext = NULL; if (sehnd) { selabel_lookup(sehnd, &secontext, targetFile, UNZIP_FILEMODE); setfscreatecon(secontext); } -#endif int fd = creat(targetFile, UNZIP_FILEMODE); -#ifdef HAVE_SELINUX if (secontext) { freecon(secontext); setfscreatecon(NULL); } -#endif if (fd < 0) { LOGE("Can't create target file \"%s\": %s\n", |