summaryrefslogtreecommitdiffstats
path: root/updater
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 /updater
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 'updater')
-rw-r--r--updater/install.cpp3
-rw-r--r--updater/updater.cpp3
-rw-r--r--updater/updater.h4
3 files changed, 6 insertions, 4 deletions
diff --git a/updater/install.cpp b/updater/install.cpp
index bc4cca913..925604f31 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -27,7 +27,6 @@
#include <unistd.h>
#include <fcntl.h>
#include <time.h>
-#include <selinux/selinux.h>
#include <ftw.h>
#include <sys/capability.h>
#include <sys/xattr.h>
@@ -40,6 +39,8 @@
#include <android-base/parseint.h>
#include <android-base/strings.h>
#include <android-base/stringprintf.h>
+#include <selinux/label.h>
+#include <selinux/selinux.h>
#include "bootloader.h"
#include "applypatch/applypatch.h"
diff --git a/updater/updater.cpp b/updater/updater.cpp
index 1693fa1db..0497d6a85 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -27,6 +27,9 @@
#include "minzip/SysUtil.h"
#include "config.h"
+#include <selinux/label.h>
+#include <selinux/selinux.h>
+
// Generated by the makefile, this function defines the
// RegisterDeviceExtensions() function, which calls all the
// registration functions for device-specific extensions.
diff --git a/updater/updater.h b/updater/updater.h
index d1dfdd05e..d3a09b93d 100644
--- a/updater/updater.h
+++ b/updater/updater.h
@@ -20,9 +20,6 @@
#include <stdio.h>
#include "minzip/Zip.h"
-#include <selinux/selinux.h>
-#include <selinux/label.h>
-
typedef struct {
FILE* cmd_pipe;
ZipArchive* package_zip;
@@ -32,6 +29,7 @@ typedef struct {
size_t package_zip_len;
} UpdaterInfo;
+struct selabel_handle;
extern struct selabel_handle *sehandle;
#endif