diff options
Diffstat (limited to 'prebuilt')
-rw-r--r-- | prebuilt/Android.mk | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 6e9bcfedf..fb27f0a64 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -183,7 +183,6 @@ ifeq ($(TW_INCLUDE_CRYPTO), true) ifeq ($(TW_INCLUDE_CRYPTO_FBE), true) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libe4crypt.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libgatekeeper.so - RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsoftkeymaster.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster_messages.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeystore_binder.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbinder.so @@ -210,6 +209,9 @@ ifeq ($(TW_INCLUDE_CRYPTO), true) else RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster1.so endif + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 28; echo $$?),0) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsoftkeymaster.so + endif endif endif ifeq ($(AB_OTA_UPDATER), true) @@ -219,7 +221,9 @@ ifeq ($(AB_OTA_UPDATER), true) endif endif ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) - RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/make_ext4fs + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 28; echo $$?),0) + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/make_ext4fs + endif endif ifneq ($(wildcard system/core/libsparse/Android.*),) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsparse.so @@ -313,10 +317,19 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hidl.base@1.0.so endif endif +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 27; echo $$?),0) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.ubsan_standalone-aarch64-android.so + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/liblogwrap.so +endif + +TW_BB_SYMLINKS := +ifneq ($(TW_USE_TOOLBOX), true) + TW_BB_SYMLINKS := busybox_symlinks +endif TWRP_AUTOGEN := $(intermediates)/teamwin GEN := $(intermediates)/teamwin -$(GEN): $(RELINK) +$(GEN): $(RELINK) $(TW_BB_SYMLINKS) $(GEN): $(RELINK_SOURCE_FILES) $(call intermediates-dir-for,EXECUTABLES,init)/init $(RELINK) $(TARGET_RECOVERY_ROOT_OUT)/sbin $(RELINK_SOURCE_FILES) |