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

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

Merge "minadbd: Export minadbd/types.h to libinstall." 

am: ffa9ffbd

Change-Id: I18571b1a696b02cab050b570bf36878e25a27462
parents 617d01a9 ffa9ffbd

install/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ cc_defaults { 
        "recovery_defaults",

    ],



    header_libs: [

        "libminadbd_headers",

    ],



    shared_libs: [

        "libbase",

        "libbootloader_message",
@@ -69,6 +65,10 @@ cc_library_static { 
        "wipe_device.cpp",

    ],



    header_libs: [

        "libminadbd_headers",

    ],



    shared_libs: [

        "librecovery_ui",

    ],

install/adb_install.cpp

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

#include "install/install.h"

#include "install/wipe_data.h"

#include "minadbd_types.h"

#include "minadbd/types.h"

#include "otautil/sysutil.h"

#include "recovery_ui/device.h"

#include "recovery_ui/ui.h"

minadbd/Android.bp

+9 −2
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ cc_defaults { 
    include_dirs: [

        "system/core/adb",

    ],



    header_libs: [

        "libminadbd_headers",

    ],

}



// `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing
@@ -58,9 +62,12 @@ cc_library { 
cc_library_headers {

    name: "libminadbd_headers",

    recovery_available: true,

    // TODO create a include dir

    export_include_dirs: [

        ".",

        "include",

    ],

    // adb_install.cpp

    visibility: [

        "//bootable/recovery/install",

    ],

}

minadbd/minadbd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
#include "adb_auth.h"

#include "transport.h"



#include "minadbd/types.h"

#include "minadbd_services.h"

#include "minadbd_types.h"



using namespace std::string_literals;