From 3454ade92db48236057814f0ade5fa45bd57cd62 Mon Sep 17 00:00:00 2001 From: Dees Troy Date: Tue, 20 Jan 2015 19:21:04 +0000 Subject: Use /twres instead of /res for theme resources AOSP and other ROM trees now do a rm -rf of the res folder during the ramdisk creation process that removes the TWRP resources. Using /twres instead of /res works around this issue making TWRP more compatible with AOSP and other build trees. Change-Id: I0d4c7e06ca381ac5aa0069b6f2b8c47f7dec49e7 --- prebuilt/Android.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'prebuilt') diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 2671e1b3d..00c524890 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -215,7 +215,7 @@ ifeq ($(TW_INCLUDE_DUMLOCK), true) LOCAL_MODULE := htcdumlocksys LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/htcd + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH) LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) @@ -224,7 +224,7 @@ ifeq ($(TW_INCLUDE_DUMLOCK), true) LOCAL_MODULE := flash_imagesys LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/htcd + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH) LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) @@ -233,7 +233,7 @@ ifeq ($(TW_INCLUDE_DUMLOCK), true) LOCAL_MODULE := dump_imagesys LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/htcd + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH) LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) @@ -242,7 +242,7 @@ ifeq ($(TW_INCLUDE_DUMLOCK), true) LOCAL_MODULE := libbmlutils.so LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/htcd + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH) LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) @@ -251,7 +251,7 @@ ifeq ($(TW_INCLUDE_DUMLOCK), true) LOCAL_MODULE := libflashutils.so LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/htcd + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH) LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) @@ -260,7 +260,7 @@ ifeq ($(TW_INCLUDE_DUMLOCK), true) LOCAL_MODULE := libmmcutils.so LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/htcd + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH) LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) @@ -269,7 +269,7 @@ ifeq ($(TW_INCLUDE_DUMLOCK), true) LOCAL_MODULE := libmtdutils.so LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/htcd + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH) LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) @@ -278,7 +278,7 @@ ifeq ($(TW_INCLUDE_DUMLOCK), true) LOCAL_MODULE := HTCDumlock.apk LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES - LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res/htcd + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH) LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) endif -- cgit v1.2.3