summaryrefslogtreecommitdiffstats
path: root/minzip
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-04-02 17:53:11 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-04-02 17:53:11 +0200
commit81247500d535dac714fad657860b67474e1f6e42 (patch)
tree425d6689f29b9d893cd250dd0b22bd72af078b1a /minzip
parentMerge "recovery: use __android_log_pmsg_file_write for log files" (diff)
parentMove selinux dependencies out of header files. (diff)
downloadandroid_bootable_recovery-81247500d535dac714fad657860b67474e1f6e42.tar
android_bootable_recovery-81247500d535dac714fad657860b67474e1f6e42.tar.gz
android_bootable_recovery-81247500d535dac714fad657860b67474e1f6e42.tar.bz2
android_bootable_recovery-81247500d535dac714fad657860b67474e1f6e42.tar.lz
android_bootable_recovery-81247500d535dac714fad657860b67474e1f6e42.tar.xz
android_bootable_recovery-81247500d535dac714fad657860b67474e1f6e42.tar.zst
android_bootable_recovery-81247500d535dac714fad657860b67474e1f6e42.zip
Diffstat (limited to 'minzip')
-rw-r--r--minzip/DirUtil.cpp5
-rw-r--r--minzip/DirUtil.h3
-rw-r--r--minzip/Zip.c3
-rw-r--r--minzip/Zip.h3
4 files changed, 9 insertions, 5 deletions
diff --git a/minzip/DirUtil.cpp b/minzip/DirUtil.cpp
index 823b6ed2f..e08e360c0 100644
--- a/minzip/DirUtil.cpp
+++ b/minzip/DirUtil.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include "DirUtil.h"
+
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@@ -26,7 +28,8 @@
#include <string>
-#include "DirUtil.h"
+#include <selinux/label.h>
+#include <selinux/selinux.h>
typedef enum { DMISSING, DDIR, DILLEGAL } DirStatus;
diff --git a/minzip/DirUtil.h b/minzip/DirUtil.h
index 85a00128b..85b83c387 100644
--- a/minzip/DirUtil.h
+++ b/minzip/DirUtil.h
@@ -24,8 +24,7 @@
extern "C" {
#endif
-#include <selinux/selinux.h>
-#include <selinux/label.h>
+struct selabel_handle;
/* Like "mkdir -p", try to guarantee that all directories
* specified in path are present, creating as many directories
diff --git a/minzip/Zip.c b/minzip/Zip.c
index 0f89835ca..9f550f8b4 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -23,6 +23,9 @@
#undef NDEBUG // do this after including Log.h
#include <assert.h>
+#include <selinux/label.h>
+#include <selinux/selinux.h>
+
#define SORT_ENTRIES 1
/*
diff --git a/minzip/Zip.h b/minzip/Zip.h
index e6b19e1f0..c932c1178 100644
--- a/minzip/Zip.h
+++ b/minzip/Zip.h
@@ -18,8 +18,7 @@
extern "C" {
#endif
-#include <selinux/selinux.h>
-#include <selinux/label.h>
+struct selabel_handle;
/*
* One entry in the Zip archive. Treat this as opaque -- use accessors below.