diff options
| author | Kenny Root <kroot@google.com> | 2012-10-17 02:49:23 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 02:49:23 +0200 |
| commit | a0d9ddb8f2922088b08219326afeaf532b3af5ac (patch) | |
| tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad /recovery.cpp | |
| parent | am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge (diff) | |
| parent | resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp (diff) | |
| download | android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.gz android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.bz2 android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.lz android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.xz android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.zst android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.zip | |
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 594774f5a..92aa50372 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(); |