From aac05c2f076894029764f9d7dff58f5c52f0673d Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Tue, 12 Dec 2017 07:04:05 -0600 Subject: Fix android.hidle.base@1.0 rule for various 8.0 trees Change-Id: I57a1a807841b20860c9a1c9523be385b12b6b933 --- prebuilt/Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 0c7469412..7b950fcef 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -295,7 +295,6 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0) 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 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0) 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 -- cgit v1.2.3