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

Commit 86de943d authored by Bill Rassieur's avatar Bill Rassieur
Browse files

Merge master@5428150 into git_qt-dev-plus-aosp. 

Change-Id: I1c69d7c91e68fd4baba7b6510acf2a69e1a6c5d7
BUG: 129345239
parents 74253cca 1055819f

Android.bp

+3 −70
Original line number Diff line number Diff line
@@ -63,32 +63,18 @@ cc_defaults { 
        "libbootloader_message",

        "libcrypto",

        "libcutils",

        "libext4_utils",

        "libfs_mgr",

        "libfusesideload",

        "libhidl-gen-utils",

        "libhidlbase",

        "libhidltransport",

        "liblog",

        "libpng",

        "libselinux",

        "libtinyxml2",

        "libutils",

        "libz",

        "libziparchive",

    ],



    static_libs: [

        "librecovery_fastboot",

        "libminui",

        "libpackage",

        "libverifier",

        "libotautil",



        // external dependencies

        "libhealthhalutils",

        "libvintf_recovery",

        "libvintf",

        "libfstab",

    ],

}
@@ -102,69 +88,14 @@ cc_library_static { 
    ],



    srcs: [

        "adb_install.cpp",

        "fsck_unshare_blocks.cpp",

        "fuse_sdcard_install.cpp",

        "install.cpp",

        "recovery.cpp",

        "roots.cpp",

    ],



    shared_libs: [

        "libinstall",

        "librecovery_ui",

    ],



    include_dirs: [

        "system/vold",

    ],

}



cc_library_static {

    name: "libverifier",

    recovery_available: true,



    defaults: [

        "recovery_defaults",

    ],



    srcs: [

        "asn1_decoder.cpp",

        "verifier.cpp",

    ],



    shared_libs: [

        "libbase",

        "libcrypto",

        "libcrypto_utils",

        "libziparchive",

    ],



    static_libs: [

        "libotautil",

    ],

}



cc_library_static {

    name: "libpackage",

    recovery_available: true,



    defaults: [

        "recovery_defaults",

    ],



    srcs: [

        "package.cpp",

    ],



    shared_libs: [

        "libbase",

        "libcrypto",

        "libziparchive",

    ],



    static_libs: [

        "libotautil",

    ],

}



cc_binary {
@@ -172,6 +103,7 @@ cc_binary { 
    recovery: true,



    defaults: [

        "libinstall_defaults",

        "librecovery_defaults",

    ],
@@ -181,6 +113,7 @@ cc_binary { 
    ],



    shared_libs: [

        "libinstall",

        "libminadbd_services",

        "librecovery_ui",

    ],

applypatch/applypatch.cpp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static bool ReadPartitionToBuffer(const Partition& partition, FileContents* out, 
  }



  android::base::unique_fd dev(open(partition.name.c_str(), O_RDONLY));

  if (!dev) {

  if (dev == -1) {

    PLOG(ERROR) << "Failed to open eMMC partition \"" << partition << "\"";

  } else {

    std::vector<unsigned char> buffer(partition.size);

common.h

+1 −11
Original line number Diff line number Diff line
@@ -14,11 +14,7 @@ 
 * limitations under the License.

 */



#ifndef RECOVERY_COMMON_H

#define RECOVERY_COMMON_H



#include <stdarg.h>

#include <stdio.h>

#pragma once



#include <string>
@@ -31,7 +27,6 @@ struct selabel_handle; 


extern struct selabel_handle* sehandle;

extern RecoveryUI* ui;

extern bool modified_flash;

extern bool has_cache;



// The current stage, e.g. "1/2".
@@ -40,9 +35,4 @@ extern std::string stage; 
// The reason argument provided in "--reason=".

extern const char* reason;



void ui_print(const char* format, ...) __printflike(1, 2);



bool is_ro_debuggable();
 


bool SetUsbConfig(const std::string& state);

#endif  // RECOVERY_COMMON_H

fsck_unshare_blocks.cpp

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

#include <fstab/fstab.h>



#include "roots.h"

#include "otautil/roots.h"



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

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

fuse_sideload/fuse_sideload.cpp

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ int run_fuse_sideload(std::unique_ptr<FuseDataProvider>&& provider, const char* 
  }



  fd.ffd.reset(open("/dev/fuse", O_RDWR));

  if (!fd.ffd) {

  if (fd.ffd == -1) {

    perror("open /dev/fuse");

    result = -1;

    goto done;