diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | prebuilt/Android.mk | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 8ed4c6c3f..3b29c7acc 100644 --- a/Android.mk +++ b/Android.mk @@ -15,7 +15,7 @@ LOCAL_PATH := $(call my-dir) commands_TWRP_local_path := $(LOCAL_PATH) -ifdef project-path-for +ifneq ($(project-path-for),) ifeq ($(LOCAL_PATH),$(call project-path-for,recovery)) PROJECT_PATH_AGREES := true BOARD_SEPOLICY_DIRS += $(call project-path-for,recovery)/sepolicy diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index e28becd47..e7bf8017e 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -208,6 +208,9 @@ ifeq ($(TW_INCLUDE_CRYPTO), true) ifneq ($(wildcard hardware/interfaces/weaver/Android.bp),) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.weaver@1.0.so endif + ifneq ($(wildcard hardware/interfaces/weaver/1.0/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 |