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

Commit 0217d52d authored by Josh Gao's avatar Josh Gao
Browse files

Move libadbd_auth, libadbd_fs to adbd_system_binaries. 

The required block inside the definition of "adbd" does nothing: we get
the libraries it contains via direct dependency when building from
source, and not at all when using a prebuilt. Move them to a phony
rule that's explicitly listed in PRODUCT_PACKAGES.

Bug: http://b/157709367
Test: treehugger
Change-Id: I97c0889558482cfbe18ae91b39b6889d3fee877c
(cherry picked from commit e572f2fc)
parent 39bdf397

adb/Android.bp

+7 −7
Original line number Diff line number Diff line
@@ -605,16 +605,14 @@ cc_binary { 
            ],

        }

    },



    required: [

        "libadbd_auth",

        "libadbd_fs",

    ],

}



phony {

    name: "adbd_system_binaries",

    // Interface between adbd in a module and the system.

    name: "adbd_system_api",

    required: [

        "libadbd_auth",

        "libadbd_fs",

        "abb",

        "reboot",

        "set-verity-state",
@@ -622,8 +620,10 @@ phony { 
}



phony {

    name: "adbd_system_binaries_recovery",

    name: "adbd_system_api_recovery",

    required: [

        "libadbd_auth",

        "libadbd_fs",

        "reboot.recovery",

    ],

}