summaryrefslogtreecommitdiffstats
path: root/partition.cpp
diff options
context:
space:
mode:
authorMatt Mower <mowerm@gmail.com>2017-01-18 04:14:46 +0100
committerEthan Yonker <dees_troy@teamw.in>2017-01-18 19:40:26 +0100
commit874136434a6ef13dffec9c6c8c136d2424a32c33 (patch)
tree5875f18cd9ea090a36b692de24f29e69a2b4f65d /partition.cpp
parentRestore file system type logline on restore (diff)
downloadandroid_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.gz
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.bz2
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.lz
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.xz
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.zst
android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.zip
Diffstat (limited to '')
-rw-r--r--partition.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/partition.cpp b/partition.cpp
index 359d70c86..bbee37d81 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -65,10 +65,8 @@ extern "C" {
#define CRYPT_FOOTER_OFFSET 0x4000
#endif
}
-#ifdef HAVE_SELINUX
-#include "selinux/selinux.h"
+#include <selinux/selinux.h>
#include <selinux/label.h>
-#endif
#ifdef HAVE_CAPABILITIES
#include <sys/capability.h>
#include <sys/xattr.h>
@@ -1910,7 +1908,7 @@ bool TWPartition::Wipe_EXT4() {
if (!UnMount(true))
return false;
-#if defined(HAVE_SELINUX) && defined(USE_EXT4)
+#if defined(USE_EXT4)
int ret;
char *secontext = NULL;
@@ -2619,14 +2617,14 @@ void TWPartition::Recreate_Media_Folder(void) {
#ifdef TW_INTERNAL_STORAGE_PATH
mkdir(EXPAND(TW_INTERNAL_STORAGE_PATH), 0770);
#endif
-#ifdef HAVE_SELINUX
+
// Afterwards, we will try to set the
// default metadata that we were hopefully able to get during
// early boot.
tw_set_default_metadata(Media_Path.c_str());
if (!Internal_path.empty())
tw_set_default_metadata(Internal_path.c_str());
-#endif
+
// Toggle mount to ensure that "internal sdcard" gets mounted
PartitionManager.UnMount_By_Path(Symlink_Mount_Point, true);
PartitionManager.Mount_By_Path(Symlink_Mount_Point, true);