commit c274348f66c35b5b9c4f6e624d78cf02a0b9b7aa
author Josh Gao <jmgao@google.com> Tue Nov 05 23:36:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 05 23:36:39 2019 +0000
tree f22965eed3b74f3a731d062c16b25e07c5384b5d
parent f5ad6e5443d16a6d3874c0b05ea5e5e6216d4036
parent 4b7f73c0da54013e8831ce4277160c7f5d28f0ce

Merge "Build the adbd apex."

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 2fd0312..94a1524 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -16,7 +16,6 @@
 
 # Base modules and settings for the system partition.
 PRODUCT_PACKAGES += \
-    adbd \
     adbd_system_binaries \
     am \
     android.hidl.allocator@1.0-service \
@@ -48,6 +47,7 @@
     cgroups.json \
     charger \
     cmd \
+    com.android.adbd \
     com.android.apex.cts.shim.v1_prebuilt \
     com.android.conscrypt \
     com.android.i18n \