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

Commit 8f397309 authored by Tianjie Xu's avatar Tianjie Xu Committed by xunchang
Browse files

Move librecovery_ui to a sub-directory 

This helps to expose librecovery_ui for device specific RecoveryUi.

Bug: 76436783
Test: mma, unit tests pass
Change-Id: Ic6c3d301d5833e4a592e6ea9d9d059bc4e4919be
(cherry picked from commit b5108c37)
parent 3c61cd02

Android.bp

+5 −71
Original line number Diff line number Diff line
@@ -26,77 +26,6 @@ cc_defaults { 
    ],

}



cc_library {

    name: "librecovery_ui",

    recovery_available: true,



    defaults: [

        "recovery_defaults",

    ],



    srcs: [

        "device.cpp",

        "screen_ui.cpp",

        "ui.cpp",

        "vr_ui.cpp",

        "wear_ui.cpp"

    ],



    static_libs: [

        "libminui",

        "libotautil",

        "libfstab",

    ],



    shared_libs: [

        "libbase",

        "libpng",

        "libz",

    ],

}



// Generic device that uses ScreenRecoveryUI.

cc_library_static {

    name: "librecovery_ui_default",

    recovery_available: true,



    defaults: [

        "recovery_defaults",

    ],



    srcs: [

        "default_device.cpp",

    ],

}



// The default wear device that uses WearRecoveryUI.

cc_library_static {

    name: "librecovery_ui_wear",

    recovery_available: true,



    defaults: [

        "recovery_defaults",

    ],



    srcs: [

        "wear_device.cpp",

    ],

}



// The default VR device that uses VrRecoveryUI.

cc_library_static {

    name: "librecovery_ui_vr",

    recovery_available: true,



    defaults: [

        "recovery_defaults",

    ],



    srcs: [

        "vr_device.cpp",

    ],

}



cc_library_static {

    name: "librecovery_fastboot",

    recovery_available: true,
@@ -113,6 +42,7 @@ cc_library_static { 
        "libbootloader_message",

        "libcutils",

        "liblog",

        "librecovery_ui",

    ],



    static_libs: [
@@ -180,6 +110,10 @@ cc_library_static { 
        "roots.cpp",

    ],



    shared_libs: [

        "librecovery_ui",

    ],



    include_dirs: [

        "system/vold",

    ],

adb_install.cpp

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

#include "fuse_sideload.h"

#include "install.h"

#include "ui.h"

#include "recovery_ui/ui.h"



int apply_from_adb(bool* wipe_cache) {

  // Save the usb state to restore after the sideload operation.

fastboot/fastboot.cpp

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
#include <android-base/properties.h>

#include <bootloader_message/bootloader_message.h>



#include "device.h"

#include "ui.h"

#include "recovery_ui/ui.h"



static const std::vector<std::pair<std::string, Device::BuiltinAction>> kFastbootMenuActions{

  { "Reboot system now", Device::REBOOT },

fastboot/fastboot.h

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

#include <vector>



#include "device.h"

#include "recovery_ui/device.h"



Device::BuiltinAction StartFastboot(Device* device, const std::vector<std::string>& args);

fuse_sdcard_install.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#pragma once



#include "device.h"

#include "ui.h"

#include "recovery_ui/device.h"

#include "recovery_ui/ui.h"



int ApplyFromSdcard(Device* device, bool* wipe_cache, RecoveryUI* ui);