summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-04-02 18:01:25 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-04-02 18:01:25 +0200
commitdc91161a56c74bb6c73560d728d92b115f0f6e75 (patch)
tree425d6689f29b9d893cd250dd0b22bd72af078b1a
parentMerge "recovery: use __android_log_pmsg_file_write for log files" (diff)
parentMerge "Move selinux dependencies out of header files." (diff)
downloadandroid_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 '')
-rw-r--r--minzip/DirUtil.cpp5
-rw-r--r--minzip/DirUtil.h3
-rw-r--r--minzip/Zip.c3
-rw-r--r--minzip/Zip.h3
-rw-r--r--recovery.cpp5
-rw-r--r--updater/install.cpp3
-rw-r--r--updater/updater.cpp3
-rw-r--r--updater/updater.h4
8 files changed, 18 insertions, 11 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.
diff --git a/recovery.cpp b/recovery.cpp
index b5514a1c0..169413ad5 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -41,10 +41,11 @@
#include <android-base/stringprintf.h>
#include <cutils/android_reboot.h>
#include <cutils/properties.h>
+#include <healthd/BatteryMonitor.h>
#include <log/logger.h> /* Android Log packet format */
#include <private/android_logger.h> /* private pmsg functions */
-
-#include <healthd/BatteryMonitor.h>
+#include <selinux/label.h>
+#include <selinux/selinux.h>
#include "adb_install.h"
#include "bootloader.h"
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