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

Commit ee516c14 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "otautil: Factor out the utils that're private to recovery." am: c6fb9f9d am: dc717a5c 

am: 2772cfcb

Change-Id: I89b1920d0cf6fddb7af1b0927adb6181e1204ab5
parents f8d4db46 2772cfcb

Android.bp

+3 −2
Original line number Original line Diff line number Diff line
@@ -72,6 +72,7 @@ cc_defaults { 
        "libinstall",

        "libinstall",

        "librecovery_fastboot",

        "librecovery_fastboot",

        "libminui",

        "libminui",

        "librecovery_utils",

        "libotautil",

        "libotautil",





        // external dependencies

        // external dependencies
@@ -148,7 +149,7 @@ cc_binary { 
    ],

    ],





    static_libs: [

    static_libs: [

        "libotautil",

        "librecovery_utils",

    ],

    ],





    init_rc: [

    init_rc: [
@@ -174,7 +175,7 @@ cc_binary { 
    ],

    ],





    static_libs: [

    static_libs: [

        "libotautil",

        "librecovery_utils",

    ],

    ],





    init_rc: [

    init_rc: [

fsck_unshare_blocks.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <android-base/unique_fd.h>

#include <android-base/unique_fd.h>

#include <fs_mgr/roots.h>

#include <fs_mgr/roots.h>





#include "otautil/roots.h"

#include "recovery_utils/roots.h"





static constexpr const char* SYSTEM_E2FSCK_BIN = "/system/bin/e2fsck_static";

static constexpr const char* SYSTEM_E2FSCK_BIN = "/system/bin/e2fsck_static";

static constexpr const char* TMP_E2FSCK_BIN = "/tmp/e2fsck.bin";

static constexpr const char* TMP_E2FSCK_BIN = "/tmp/e2fsck.bin";

install/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ cc_defaults { 
    ],

    ],





    static_libs: [

    static_libs: [

        "librecovery_utils",

        "libotautil",

        "libotautil",





        // external dependencies

        // external dependencies

install/fuse_install.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "fuse_provider.h"

#include "fuse_provider.h"

#include "fuse_sideload.h"

#include "fuse_sideload.h"

#include "install/install.h"

#include "install/install.h"

#include "otautil/roots.h"

#include "recovery_utils/roots.h"





static constexpr const char* SDCARD_ROOT = "/sdcard";

static constexpr const char* SDCARD_ROOT = "/sdcard";

// How long (in seconds) we wait for the fuse-provided package file to

// How long (in seconds) we wait for the fuse-provided package file to

install/install.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -51,11 +51,11 @@ 
#include "install/wipe_data.h"

#include "install/wipe_data.h"

#include "otautil/error_code.h"

#include "otautil/error_code.h"

#include "otautil/paths.h"

#include "otautil/paths.h"

#include "otautil/roots.h"

#include "otautil/sysutil.h"

#include "otautil/sysutil.h"

#include "otautil/thermalutil.h"

#include "private/setup_commands.h"

#include "private/setup_commands.h"

#include "recovery_ui/ui.h"

#include "recovery_ui/ui.h"

#include "recovery_utils/roots.h"

#include "recovery_utils/thermalutil.h"





using namespace std::chrono_literals;

using namespace std::chrono_literals;