From 73cdf4dae701e70395ddc3c6222250e7dc3a09ef Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Mon, 1 Jun 2020 18:59:21 -0700
Subject: [PATCH] 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 e572f2fc44be87f48a605c7c603401b712cbf841)

Former-commit-id: 0217d52d0157b0d66e778df58ad99f50abb78366
---
 adb/Android.bp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/adb/Android.bp b/adb/Android.bp
index f8e5b38e3..50f62920c 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -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",
     ],
 }