diff options
| author | Kenny Root <kroot@google.com> | 2012-10-16 17:44:21 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-10-16 17:44:21 -0700 |
| commit | cd74108cdac228e946ca8b6ea2ff11ab62941a6d (patch) | |
| tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad /recovery.cpp | |
| parent | d0d4d44d344779e59ee196637bbc745d68d70677 (diff) | |
| parent | 78afed1c15989d4aa7e66094afa81cd3a6d22674 (diff) | |
| download | bootable_recovery-cd74108cdac228e946ca8b6ea2ff11ab62941a6d.zip bootable_recovery-cd74108cdac228e946ca8b6ea2ff11ab62941a6d.tar.gz bootable_recovery-cd74108cdac228e946ca8b6ea2ff11ab62941a6d.tar.bz2 | |
resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp
Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp index 594774f..92aa503 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -863,7 +863,6 @@ main(int argc, char **argv) { ui->SetBackground(RecoveryUI::NONE); if (show_text) ui->ShowText(true); -#ifdef HAVE_SELINUX struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "/file_contexts" } }; @@ -874,7 +873,6 @@ main(int argc, char **argv) { fprintf(stderr, "Warning: No file_contexts\n"); ui->Print("Warning: No file_contexts\n"); } -#endif device->StartRecovery(); |