summaryrefslogtreecommitdiffstats
path: root/prebuilt
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2017-11-29 19:13:41 +0100
committerEthan Yonker <dees_troy@teamw.in>2017-11-29 20:23:50 +0100
commit31344a3b2f0adbb226134aacf10f70712775b78e (patch)
tree72c55bb0e98bf1bba5c74b88b57fe7293b413b44 /prebuilt
parentminui: Fix building graphics_overlay.cpp (diff)
downloadandroid_bootable_recovery-31344a3b2f0adbb226134aacf10f70712775b78e.tar
android_bootable_recovery-31344a3b2f0adbb226134aacf10f70712775b78e.tar.gz
android_bootable_recovery-31344a3b2f0adbb226134aacf10f70712775b78e.tar.bz2
android_bootable_recovery-31344a3b2f0adbb226134aacf10f70712775b78e.tar.lz
android_bootable_recovery-31344a3b2f0adbb226134aacf10f70712775b78e.tar.xz
android_bootable_recovery-31344a3b2f0adbb226134aacf10f70712775b78e.tar.zst
android_bootable_recovery-31344a3b2f0adbb226134aacf10f70712775b78e.zip
Diffstat (limited to '')
-rw-r--r--prebuilt/Android.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 4e180105c..02bb49afa 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -195,10 +195,14 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/keystore_cli
RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/servicemanager
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.system.wifi.keystore@1.0.so
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster_portable.so
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster_staging.so
+ ifneq ($(wildcard system/keymaster/keymaster_stl.cpp),)
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster_portable.so
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster_staging.so
+ endif
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libwifikeystorehal.so
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.weaver@1.0.so
+ ifneq ($(wildcard hardware/interfaces/weaver/Android.bp),)
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.weaver@1.0.so
+ endif
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhardware_legacy.so
else
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster1.so
@@ -300,7 +304,9 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0)
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libvintf.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libtinyxml2.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hidl.token@1.0.so
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeyutils.so
+ ifneq ($(wildcard system/core/libkeyutils/Android.bp),)
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeyutils.so
+ endif
endif
TWRP_AUTOGEN := $(intermediates)/teamwin