summaryrefslogtreecommitdiffstats
path: root/gui/Android.mk
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2015-10-05 05:09:08 +0200
committerEthan Yonker <dees_troy@teamw.in>2015-10-15 16:23:39 +0200
commit88037f476f43354725e4fb06e36b56128f33cd5a (patch)
tree7c21765296475fdf523a38c4c2f611af1dcb395e /gui/Android.mk
parentFix up twrpTar (diff)
downloadandroid_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar
android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.gz
android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.bz2
android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.lz
android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.xz
android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.zst
android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.zip
Diffstat (limited to '')
-rw-r--r--gui/Android.mk13
1 files changed, 1 insertions, 12 deletions
diff --git a/gui/Android.mk b/gui/Android.mk
index 1fef03d41..1d0d134ec 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -58,9 +58,6 @@ endif
ifeq ($(TW_OEM_BUILD), true)
LOCAL_CFLAGS += -DTW_OEM_BUILD
endif
-ifeq ($(TW_DISABLE_TTF), true)
- LOCAL_CFLAGS += -DTW_DISABLE_TTF
-endif
ifneq ($(TW_X_OFFSET),)
LOCAL_CFLAGS += -DTW_X_OFFSET=$(TW_X_OFFSET)
endif
@@ -113,8 +110,7 @@ ifeq ($(TWRP_NEW_THEME),true)
# for future copying of used include xmls and fonts:
# UI_XML := $(TWRP_THEME_LOC)/ui.xml
# TWRP_INCLUDE_XMLS := $(shell xmllint --xpath '/recovery/include/xmlfile/@name' $(UI_XML)|sed -n 's/[^\"]*\"\([^\"]*\)\"[^\"]*/\1\n/gp'|sort|uniq)
-# TWRP_FONTS_TTF := $(shell xmllint --xpath '/recovery/resources/font/@filename' $(UI_XML)|sed -n 's/[^\"]*\"\([^\"]*\)\"[^\"]*/\1\n/gp'|sort|uniq)
-# TWRP_FONTS_DAT := $(shell xmllint --xpath '/recovery/resources/font/@fallback' $(UI_XML)|sed -n 's/[^\"]*\"\([^\"]*\)\"[^\"]*/\1.dat\n/gp'|sort|uniq)
+# TWRP_FONTS_TTF := $(shell xmllint --xpath '/recovery/resources/font/@filename' $(UI_XML)|sed -n 's/[^\"]*\"\([^\"]*\)\"[^\"]*/\1\n/gp'|sort|uniq)niq)
ifeq ($(wildcard $(TWRP_THEME_LOC)/ui.xml),)
$(warning ****************************************************************************)
$(warning * TW_THEME is not valid: '$(TW_THEME)')
@@ -150,12 +146,6 @@ else
TWRP_THEME_LOC := $(TW_CUSTOM_THEME)
endif
-ifeq ($(TW_DISABLE_TTF), true)
- TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.ttf
-else
- TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.dat
-endif
-
TWRP_RES_GEN := $(intermediates)/twrp
ifneq ($(TW_USE_TOOLBOX), true)
TWRP_SH_TARGET := /sbin/busybox
@@ -167,7 +157,6 @@ $(TWRP_RES_GEN):
mkdir -p $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
cp -fr $(TWRP_RES) $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
cp -fr $(TWRP_THEME_LOC)/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
- $(TWRP_REMOVE_FONT)
mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/
ifneq ($(TW_USE_TOOLBOX), true)
ln -sf $(TWRP_SH_TARGET) $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh