commit baeabc5b436228e0d3bf6c3a1b656a78caaa0fae
author big biff <bigbiff@teamw.in> Wed Jan 17 01:40:29 2018 +0100
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Wed Jan 17 01:40:29 2018 +0100
tree 8066faa38301fe92963036e5f277d0bfbfb29d55
parent 3eb70edb4a9cd03b3b1c9dd54b801579f06b60ca
parent 35764fdce6c52cd9834a240f4d9e06687f161848

Merge "Relink adbd needed in android 8.1" into android-8.1

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 7b950fc..b54dda2 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -34,6 +34,9 @@
 RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/fsck.fat
 RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/fatlabel
 RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/mkfs.fat
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?),0)
+    RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/adbd
+endif
 RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/e2fsck
 RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mke2fs
 RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/tune2fs