diff options
| author | Dees Troy <dees_troy@teamw.in> | 2015-01-20 20:21:04 +0100 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2015-01-22 22:21:27 +0100 |
| commit | 3454ade92db48236057814f0ade5fa45bd57cd62 (patch) | |
| tree | 8cf3de0c390157420ad0fe9a33b17237132ba7cb /gui/Android.mk | |
| parent | Hide some non critical error messages (diff) | |
| download | android_bootable_recovery-3454ade92db48236057814f0ade5fa45bd57cd62.tar android_bootable_recovery-3454ade92db48236057814f0ade5fa45bd57cd62.tar.gz android_bootable_recovery-3454ade92db48236057814f0ade5fa45bd57cd62.tar.bz2 android_bootable_recovery-3454ade92db48236057814f0ade5fa45bd57cd62.tar.lz android_bootable_recovery-3454ade92db48236057814f0ade5fa45bd57cd62.tar.xz android_bootable_recovery-3454ade92db48236057814f0ade5fa45bd57cd62.tar.zst android_bootable_recovery-3454ade92db48236057814f0ade5fa45bd57cd62.zip | |
Diffstat (limited to '')
| -rw-r--r-- | gui/Android.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gui/Android.mk b/gui/Android.mk index e75c5214a..fca5e0787 100644 --- a/gui/Android.mk +++ b/gui/Android.mk @@ -82,6 +82,7 @@ ifeq ($(TW_CUSTOM_THEME),) endif LOCAL_C_INCLUDES += bionic external/stlport/stlport $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION) +LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\" include $(BUILD_STATIC_LIBRARY) @@ -90,7 +91,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := twrp LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res +LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) TWRP_RES_LOC := $(commands_recovery_local_path)/gui/devices/common/res TWRP_COMMON_XML := $(hide) echo "No common TWRP XML resources" @@ -100,20 +101,20 @@ ifeq ($(TW_CUSTOM_THEME),) WATCH := 240x240 280x280 320x320 TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)/res ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT)),) - TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/ + TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE)),) - TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/ + TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) else ifneq ($(filter $(DEVICE_RESOLUTION), $(WATCH)),) - TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/watch/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/ + TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/watch/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) endif else TWRP_THEME_LOC := $(TW_CUSTOM_THEME) endif ifeq ($(TW_DISABLE_TTF), true) - TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)/res/fonts/*.ttf + TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.ttf else - TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)/res/fonts/*.dat + TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.dat endif TWRP_RES_GEN := $(intermediates)/twrp @@ -124,9 +125,9 @@ else endif $(TWRP_RES_GEN): - mkdir -p $(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)$(TWRES_PATH) + cp -fr $(TWRP_RES_LOC)/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) + cp -fr $(TWRP_THEME_LOC)/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) $(TWRP_COMMON_XML) $(TWRP_REMOVE_FONT) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/ |