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

Commit 5edce0ef authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Build adbd for recovery" 

am: 6c9bb058

Change-Id: I54574b6c041b3f78dbc0ce094fb7bfab35a54df5
parents 06d71a71 6c9bb058

adb/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ cc_binary_host { 
cc_library_static {

    name: "libadbd",

    defaults: ["adb_defaults"],

    recovery_available: true,



    // libminadbd wants both, for some reason.

    compile_multilib: "both",
@@ -302,6 +303,7 @@ cc_binary { 


    // adbd must be static, as it is copied into the recovery image.

    static_executable: true,

    recovery_available: true,



    srcs: [

        "daemon/main.cpp",

base/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ cc_library { 
    name: "libbase",

    defaults: ["libbase_defaults"],

    vendor_available: true,

    recovery_available: true,

    host_supported: true,

    vndk: {

        enabled: true,

debuggerd/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ cc_defaults { 
cc_library_headers {

    name: "libdebuggerd_common_headers",

    export_include_dirs: ["common/include"],

    recovery_available: true,

}



cc_library_shared {
@@ -67,6 +68,7 @@ cc_library_static { 
cc_library_static {

    name: "libdebuggerd_handler_core",

    defaults: ["debuggerd_defaults"],

    recovery_available: true,

    srcs: ["handler/debuggerd_handler.cpp"],



    header_libs: [
@@ -88,6 +90,7 @@ cc_library_static { 
cc_library_static {

    name: "libdebuggerd_handler",

    defaults: ["debuggerd_defaults"],

    recovery_available: true,

    srcs: ["handler/debuggerd_fallback_nop.cpp"],



    whole_static_libs: [
@@ -143,6 +146,7 @@ cc_library { 
cc_library_static {

    name: "libdebuggerd",

    defaults: ["debuggerd_defaults"],

    recovery_available: true,



    srcs: [

        "libdebuggerd/backtrace.cpp",

demangle/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ cc_library { 
    name: "libdemangle",

    defaults: ["libdemangle_defaults"],

    vendor_available: true,

    recovery_available: true,



    srcs: [

        "Demangler.cpp",

diagnose_usb/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ cc_library_static { 
    name: "libdiagnose_usb",

    cflags: ["-Wall", "-Wextra", "-Werror"],

    host_supported: true,

    recovery_available: true,

    target: {

        windows: {

            enabled: true,