diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2017-10-01 05:22:13 +0200 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2017-11-28 23:03:41 +0100 |
| commit | fefe5915b06a1121d885fba3680dd1b90027fd5d (patch) | |
| tree | 2370923b618bdbe2592873cd311944628a1d0a62 /prebuilt | |
| parent | Merge "Support v2 fstab format" into android-8.0 (diff) | |
| download | android_bootable_recovery-fefe5915b06a1121d885fba3680dd1b90027fd5d.tar android_bootable_recovery-fefe5915b06a1121d885fba3680dd1b90027fd5d.tar.gz android_bootable_recovery-fefe5915b06a1121d885fba3680dd1b90027fd5d.tar.bz2 android_bootable_recovery-fefe5915b06a1121d885fba3680dd1b90027fd5d.tar.lz android_bootable_recovery-fefe5915b06a1121d885fba3680dd1b90027fd5d.tar.xz android_bootable_recovery-fefe5915b06a1121d885fba3680dd1b90027fd5d.tar.zst android_bootable_recovery-fefe5915b06a1121d885fba3680dd1b90027fd5d.zip | |
Diffstat (limited to 'prebuilt')
| -rw-r--r-- | prebuilt/Android.mk | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index aff20d555..4e180105c 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -63,10 +63,10 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_uuid.so ifneq ($(wildcard external/e2fsprogs/lib/quota/Android.mk),) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_quota.so endif -ifneq ($(wildcard external/e2fsprogs/lib/ext2fs/Android.mk),) +ifneq ($(wildcard external/e2fsprogs/lib/ext2fs/Android.*),) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2fs.so endif -ifneq ($(wildcard external/e2fsprogs/lib/blkid/Android.mk),) +ifneq ($(wildcard external/e2fsprogs/lib/blkid/Android.*),) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_blkid.so endif RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpng.so @@ -186,7 +186,23 @@ ifeq ($(TW_INCLUDE_CRYPTO), true) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbinder.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libprotobuf-cpp-lite.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsoftkeymasterdevice.so - RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster1.so + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.gatekeeper@1.0.so + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/hwservicemanager + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/avbctl + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/hwservicemanager + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/keystore + 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 + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libwifikeystorehal.so + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.weaver@1.0.so + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhardware_legacy.so + else + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster1.so + endif endif endif ifeq ($(AB_OTA_UPDATER), true) @@ -198,7 +214,7 @@ endif ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/make_ext4fs endif -ifneq ($(wildcard system/core/libsparse/Android.mk),) +ifneq ($(wildcard system/core/libsparse/Android.*),) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsparse.so endif ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true) @@ -223,7 +239,7 @@ ifeq ($(TARGET_USERIMAGES_USE_F2FS), true) endif RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/fsck.f2fs endif -ifneq ($(wildcard system/core/reboot/Android.mk),) +ifneq ($(wildcard system/core/reboot/Android.*),) RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/reboot endif ifneq ($(TW_DISABLE_TTF), true) @@ -275,10 +291,16 @@ 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)/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 + + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhidl-gen-utils.so + 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 endif TWRP_AUTOGEN := $(intermediates)/teamwin |