From a33161b02020d34baf210c2bd89201564d6d99f6 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Thu, 6 Nov 2014 15:11:20 -0600 Subject: Revert to old libminui and fix up We will wait for CAF to give us a new libminui that supports qualcomm overlay before moving up to the new format if possible. Attempt to fix up old libminui to work with new libpng. Change-Id: I494b7287b347f4730aa8f9d27d4cc17b6e93919a --- minui/Android.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'minui/Android.mk') diff --git a/minui/Android.mk b/minui/Android.mk index 7b401567d..54eb06166 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := graphics_adf.c graphics_fbdev.c graphics_overlay.c events.c resources.c +LOCAL_SRC_FILES := graphics_overlay.c events.c resources.c ifneq ($(BOARD_CUSTOM_GRAPHICS),) LOCAL_SRC_FILES += $(BOARD_CUSTOM_GRAPHICS) else @@ -25,8 +25,6 @@ else endif LOCAL_STATIC_LIBRARY := libpng -LOCAL_WHOLE_STATIC_LIBRARIES += libadf - LOCAL_MODULE := libminui # This used to compare against values in double-quotes (which are just @@ -62,7 +60,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := graphics_adf.c graphics_fbdev.c graphics_overlay.c events.c resources.c +LOCAL_SRC_FILES := graphics_overlay.c events.c resources.c ifneq ($(BOARD_CUSTOM_GRAPHICS),) LOCAL_SRC_FILES += $(BOARD_CUSTOM_GRAPHICS) else @@ -89,7 +87,6 @@ LOCAL_MODULE := libminui LOCAL_ARM_MODE:= arm LOCAL_SHARED_LIBRARIES := libpng libpixelflinger -LOCAL_WHOLE_STATIC_LIBRARIES += libadf # This used to compare against values in double-quotes (which are just # ordinary characters in this context). Strip double-quotes from the # value so that either will work. -- cgit v1.2.3