commit aac05c2f076894029764f9d7dff58f5c52f0673d
author Ethan Yonker <dees_troy@teamw.in> Tue Dec 12 07:04:05 2017 -0600
committer Ethan Yonker <dees_troy@teamw.in> Tue Dec 12 07:04:05 2017 -0600
tree 54e72f7d783d25091197fb3813ab542fcd9074a0
parent 2af13795b9e55b57e8323abbb17e7467ebba1ff0

Fix android.hidle.base@1.0 rule for various 8.0 trees

Change-Id: I57a1a807841b20860c9a1c9523be385b12b6b933

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 0c74694..7b950fc 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -295,7 +295,6 @@
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhidlbase.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhidltransport.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.keymaster@3.0.so
-    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hidl.base@1.0.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libziparchive.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_blkid.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_quota.so
@@ -307,6 +306,9 @@
     ifneq ($(wildcard system/core/libkeyutils/Android.bp),)
         RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeyutils.so
     endif
+    ifeq ($(wildcard system/libhidl/transport/HidlTransportUtils.cpp),)
+        RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hidl.base@1.0.so
+    endif
 endif
 
 TWRP_AUTOGEN := $(intermediates)/teamwin