Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eba11fa5 authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by android-build-merger
Browse files

Fix "No file_contexts" warning 

am: e35926e1

Change-Id: Ia050561286c30d8198f3185da9e3cd31372b1d79
parents 54138462 e35926e1

recovery.cpp

+3 −6
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <healthd/BatteryMonitor.h>

#include <healthd/BatteryMonitor.h>

#include <private/android_logger.h> /* private pmsg functions */

#include <private/android_logger.h> /* private pmsg functions */

#include <private/android_filesystem_config.h>  /* for AID_SYSTEM */

#include <private/android_filesystem_config.h>  /* for AID_SYSTEM */

#include <selinux/android.h>

#include <selinux/label.h>

#include <selinux/label.h>

#include <selinux/selinux.h>

#include <selinux/selinux.h>

#include <ziparchive/zip_archive.h>

#include <ziparchive/zip_archive.h>
@@ -1481,12 +1482,8 @@ int main(int argc, char **argv) { 
    ui->SetBackground(RecoveryUI::NONE);

    ui->SetBackground(RecoveryUI::NONE);

    if (show_text) ui->ShowText(true);

    if (show_text) ui->ShowText(true);





    struct selinux_opt seopts[] = {

    sehandle = selinux_android_file_context_handle();

        { SELABEL_OPT_PATH, "/file_contexts" }

    selinux_android_set_sehandle(sehandle);

    };



    sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1);



    if (!sehandle) {

    if (!sehandle) {

        ui->Print("Warning: No file_contexts\n");

        ui->Print("Warning: No file_contexts\n");

    }

    }

updater/updater.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 




#include <android-base/logging.h>

#include <android-base/logging.h>

#include <android-base/strings.h>

#include <android-base/strings.h>

#include <selinux/android.h>

#include <selinux/label.h>

#include <selinux/label.h>

#include <selinux/selinux.h>

#include <selinux/selinux.h>

#include <ziparchive/zip_archive.h>

#include <ziparchive/zip_archive.h>
@@ -139,9 +140,8 @@ int main(int argc, char** argv) { 
    return 6;

    return 6;

  }

  }





  struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "/file_contexts" } };

  sehandle = selinux_android_file_context_handle();



  selinux_android_set_sehandle(sehandle);

  sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1);





  if (!sehandle) {

  if (!sehandle) {

    fprintf(cmd_pipe, "ui_print Warning: No file_contexts\n");

    fprintf(cmd_pipe, "ui_print Warning: No file_contexts\n");