summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2014-04-14 16:27:15 +0200
committerGerrit Code Review <gerrit2@gerrit>2014-04-15 15:27:53 +0200
commit1ecaca7d0b07593e989aa76e8387c19a0f03cc03 (patch)
tree8a574ea2252a746319f72d9f7e3991a8e16d65bc
parentImprove handling of shell symlink in recovery ramdisk (diff)
downloadandroid_bootable_recovery-1ecaca7d0b07593e989aa76e8387c19a0f03cc03.tar
android_bootable_recovery-1ecaca7d0b07593e989aa76e8387c19a0f03cc03.tar.gz
android_bootable_recovery-1ecaca7d0b07593e989aa76e8387c19a0f03cc03.tar.bz2
android_bootable_recovery-1ecaca7d0b07593e989aa76e8387c19a0f03cc03.tar.lz
android_bootable_recovery-1ecaca7d0b07593e989aa76e8387c19a0f03cc03.tar.xz
android_bootable_recovery-1ecaca7d0b07593e989aa76e8387c19a0f03cc03.tar.zst
android_bootable_recovery-1ecaca7d0b07593e989aa76e8387c19a0f03cc03.zip
-rw-r--r--gui/Android.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/gui/Android.mk b/gui/Android.mk
index 1ddab5e33..4ad558a01 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -98,8 +98,13 @@ LOCAL_MODULE := twrp
LOCAL_MODULE_TAGS := eng
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res
+TWRP_RES_LOC := $(commands_recovery_local_path)/gui/devices/common/res
-TWRP_RES_LOC := $(commands_recovery_local_path)/gui/devices
+ifeq ($(TW_CUSTOM_THEME),)
+ TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)/res
+else
+ TWRP_THEME_LOC := $(TW_CUSTOM_THEME)
+endif
TWRP_RES_GEN := $(intermediates)/twrp
ifneq ($(TW_USE_TOOLBOX), true)
TWRP_SH_TARGET := /sbin/busybox
@@ -109,8 +114,8 @@ endif
$(TWRP_RES_GEN):
mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res/
- cp -fr $(TWRP_RES_LOC)/common/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/
- cp -fr $(TWRP_RES_LOC)/$(DEVICE_RESOLUTION)/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/
+ cp -fr $(TWRP_RES_LOC)/* $(TARGET_RECOVERY_ROOT_OUT)/res/
+ cp -fr $(TWRP_THEME_LOC)/* $(TARGET_RECOVERY_ROOT_OUT)/res/
mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/
ln -sf $(TWRP_SH_TARGET) $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh
ln -sf /sbin/pigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gzip