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

Commit 2c48bd47 authored by Jacky Liu's avatar Jacky Liu Committed by Automerger Merge Worker
Browse files

Merge "Move package verifier from libinstall to libotautil" am: 86df6478 am:... 

Merge "Move package verifier from libinstall to libotautil" am: 86df6478 am: 31f842f1 am: 7c608afa

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1930535

Change-Id: I6417fd6c122e86dbf9655e5524e73691f8320a81
parents 12f1d2f7 7c608afa

install/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -105,12 +105,9 @@ cc_library_static { 


    srcs: [

        "adb_install.cpp",

        "asn1_decoder.cpp",

        "fuse_install.cpp",

        "install.cpp",

        "package.cpp",

        "snapshot_utils.cpp",

        "verifier.cpp",

        "wipe_data.cpp",

        "wipe_device.cpp",

        "spl_check.cpp",

install/include/install/install.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <ziparchive/zip_archive.h>



#include "package.h"

#include "otautil/package.h"

#include "recovery_ui/ui.h"



enum InstallResult {

install/include/install/wipe_device.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <string>

#include <vector>



#include "install/package.h"

#include "otautil/package.h"

#include "recovery_ui/device.h"



// Wipes the current A/B device, with a secure wipe of all the partitions in RECOVERY_WIPE.

install/install.cpp

+2 −2
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ 
#include <android-base/strings.h>

#include <android-base/unique_fd.h>



#include "install/package.h"

#include "install/spl_check.h"

#include "install/verifier.h"

#include "install/wipe_data.h"

#include "otautil/error_code.h"

#include "otautil/package.h"

#include "otautil/paths.h"

#include "otautil/sysutil.h"

#include "otautil/verifier.h"

#include "private/setup_commands.h"

#include "recovery_ui/ui.h"

#include "recovery_utils/roots.h"

install/wipe_device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


#include "bootloader_message/bootloader_message.h"

#include "install/install.h"

#include "install/package.h"

#include "otautil/package.h"

#include "recovery_ui/device.h"

#include "recovery_ui/ui.h"