diff options
| author | Elliott Hughes <enh@google.com> | 2016-04-02 18:01:25 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-02 18:01:25 +0200 |
| commit | dc91161a56c74bb6c73560d728d92b115f0f6e75 (patch) | |
| tree | 425d6689f29b9d893cd250dd0b22bd72af078b1a /minzip | |
| parent | Merge "recovery: use __android_log_pmsg_file_write for log files" (diff) | |
| parent | Merge "Move selinux dependencies out of header files." (diff) | |
| download | android_bootable_recovery-dc91161a56c74bb6c73560d728d92b115f0f6e75.tar android_bootable_recovery-dc91161a56c74bb6c73560d728d92b115f0f6e75.tar.gz android_bootable_recovery-dc91161a56c74bb6c73560d728d92b115f0f6e75.tar.bz2 android_bootable_recovery-dc91161a56c74bb6c73560d728d92b115f0f6e75.tar.lz android_bootable_recovery-dc91161a56c74bb6c73560d728d92b115f0f6e75.tar.xz android_bootable_recovery-dc91161a56c74bb6c73560d728d92b115f0f6e75.tar.zst android_bootable_recovery-dc91161a56c74bb6c73560d728d92b115f0f6e75.zip | |
Diffstat (limited to 'minzip')
| -rw-r--r-- | minzip/DirUtil.cpp | 5 | ||||
| -rw-r--r-- | minzip/DirUtil.h | 3 | ||||
| -rw-r--r-- | minzip/Zip.c | 3 | ||||
| -rw-r--r-- | minzip/Zip.h | 3 |
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. |