From 39662b2914269832879690f2bbe82a0e87d00ded Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Tue, 23 May 2017 08:34:02 -0500 Subject: Fix minui issues for some build trees In trees where TWRP is the primary recovery, minui.h was not setting rules properly for healthd because healthd uses clang. Must use CLANG_TARGET_GLOBAL_CFLAGS to set global flags. Change-Id: I4cd9c88f8fcaec345fe012d09abcb9f24be06ef4 --- minui/Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'minui/Android.mk') diff --git a/minui/Android.mk b/minui/Android.mk index 34bf5f5bb..249feeb0e 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -79,8 +79,9 @@ endif ifneq ($(BOARD_USE_CUSTOM_RECOVERY_FONT),) LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=$(BOARD_USE_CUSTOM_RECOVERY_FONT) endif -ifneq ($(wildcard system/core/healthd/animation.h),) - LOCAL_CFLAGS += -DTW_USE_MINUI_CUSTOM_FONTS +ifeq ($(wildcard system/core/healthd/animation.h),) + TARGET_GLOBAL_CFLAGS += -DTW_NO_MINUI_CUSTOM_FONTS + CLANG_TARGET_GLOBAL_CFLAGS += -DTW_NO_MINUI_CUSTOM_FONTS endif include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3