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

Commit 99522584 authored by Josh Gao's avatar Josh Gao
Browse files

Add libadbd_auth to adbd's required list. 

It seems like we might not be tracking dependencies properly on
devices with flattened APEXes? Add libadbd_auth to adbd's required
list to work around this for now.

Bug: http://b/148812347
Test: `ls $ANDROID_PRODUCT_OUT/system/lib/libadbd_auth.so` before and after when building a go device
Change-Id: If60abeb00797e37bf6a5a037249a21877e0b3d26
parent 2e10d8f7

adb/Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ cc_defaults { 
        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION=1",

    ],

    cpp_std: "experimental",

    stl: "libc++_static",



    use_version_lib: true,

    compile_multilib: "first",
@@ -325,6 +324,7 @@ cc_benchmark { 
cc_binary_host {

    name: "adb",



    stl: "libc++_static",

    defaults: ["adb_defaults"],



    srcs: [
@@ -542,6 +542,7 @@ cc_library { 
cc_binary {

    name: "adbd",

    defaults: ["adbd_defaults", "host_adbd_supported"],

    stl: "libc++_static",

    recovery_available: true,



    srcs: [
@@ -577,6 +578,8 @@ cc_binary { 
        "libadbd_auth",

        "libcrypto",

    ],



    required: ["libadbd_auth"],

}



phony {
@@ -599,6 +602,7 @@ cc_binary { 
    name: "abb",



    defaults: ["adbd_defaults"],

    stl: "libc++",

    recovery_available: false,



    srcs: [
@@ -631,7 +635,11 @@ cc_binary { 


cc_test {

    name: "adbd_test",



    defaults: ["adbd_defaults"],

    stl: "libc++_static",



    recovery_available: false,

    srcs: libadb_test_srcs + [

        "daemon/services.cpp",

        "daemon/shell_service.cpp",