From 9905f3a4ee90e4f569bb187e6fa15616cc54bbb7 Mon Sep 17 00:00:00 2001 From: Ajay Dudani Date: Wed, 4 Feb 2015 16:49:44 -0800 Subject: recovery: Generate libminui dynamic library Allow factory test images to use minui functionaltiy by making use of libminui dynamic library. Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c --- minui/Android.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'minui/Android.mk') diff --git a/minui/Android.mk b/minui/Android.mk index df4aac169..aee2a34ab 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -30,3 +30,10 @@ else endif include $(BUILD_STATIC_LIBRARY) + +# Used by OEMs for factory test images. +include $(CLEAR_VARS) +LOCAL_MODULE := libminui +LOCAL_WHOLE_STATIC_LIBRARIES += libminui +LOCAL_SHARED_LIBRARIES := libpng +include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3 From fd778e3e406a7e83536ea66776996f032f24af64 Mon Sep 17 00:00:00 2001 From: Tony Kuo Date: Thu, 5 Feb 2015 21:25:56 +0800 Subject: Fix Droid and animation color in recovery mode [Problem] Droid and animation color in recovery mode are incorrect [Modify] - Add support for flipping (zero copy) with RECOVERY_ABGR. - Decodes PNG files to BGRA directly, and other fills, text and alpha blending are also done directly in BGRA (i.e. blits can still bypass conversion) - Remove the BGRA workaround added previous for single buffer mode (f766396) Bug:19216535 Change-Id: Ie864419fc6da776ff58b2d02e130f203c194500f Signed-off-by: Tony Kuo --- minui/Android.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'minui/Android.mk') diff --git a/minui/Android.mk b/minui/Android.mk index aee2a34ab..ddee165f9 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -16,6 +16,9 @@ LOCAL_MODULE := libminui # ordinary characters in this context). Strip double-quotes from the # value so that either will work. +ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),ABGR_8888) + LOCAL_CFLAGS += -DRECOVERY_ABGR +endif ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),RGBX_8888) LOCAL_CFLAGS += -DRECOVERY_RGBX endif -- cgit v1.2.3 From fee324f1b6a345c4306c71abad9f9640cddd1018 Mon Sep 17 00:00:00 2001 From: Trevor Drake Date: Thu, 26 Feb 2015 15:57:58 +0000 Subject: Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk The zlib include was not required. libpng is now handled by referencing the libpng static library Change-Id: Ie4e0abad3fff5b763eba363d3d0fa96128ff49bc --- minui/Android.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'minui/Android.mk') diff --git a/minui/Android.mk b/minui/Android.mk index ddee165f9..9b2e09b70 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -4,11 +4,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := graphics.c graphics_adf.c graphics_fbdev.c events.c \ resources.c -LOCAL_C_INCLUDES +=\ - external/libpng\ - external/zlib - LOCAL_WHOLE_STATIC_LIBRARIES += libadf +LOCAL_STATIC_LIBRARIES += libpng LOCAL_MODULE := libminui -- cgit v1.2.3 From 01a4d08010d1c26cc2cb37ca62b624829a7e1506 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 24 Mar 2015 15:21:48 -0700 Subject: Fix recovery image text rendering. Previously most devices would lose the character before a line wrap. The log's text rendering was starting at offset 4 but none of the arithmetic was taking this into account. It just happened to work on the Nexus 9's 1536-pixel wide display (1536/18=85.3) but not on a device such as the Nexus 5 (1080/18=60). The only active part of this change is the change from 4 to 0 in the gr_text call. The rest is just a few bits of trivial cleanup while I was working out what was going on. Change-Id: I9279ae323c77bc8b6ea87dc0fe009aaaec6bfa0e --- 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 9b2e09b70..53d072fac 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -1,14 +1,15 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := graphics.c graphics_adf.c graphics_fbdev.c events.c \ - resources.c +LOCAL_SRC_FILES := graphics.c graphics_adf.c graphics_fbdev.c events.c resources.c LOCAL_WHOLE_STATIC_LIBRARIES += libadf LOCAL_STATIC_LIBRARIES += libpng LOCAL_MODULE := libminui +LOCAL_CFLAGS := -std=gnu11 + # 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 From 0713819fd256bfdfcf241c71195b7e8c4e18c742 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 10 Apr 2015 09:40:53 -0700 Subject: Add ev_iterate_available_keys to minui. This lets us recognize whether we have up/down/power, say, and tailor the UI accordingly. Change-Id: If94e454f14243b59d2f473ac9a436bd60591da01 --- minui/Android.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'minui/Android.mk') diff --git a/minui/Android.mk b/minui/Android.mk index 53d072fac..66dea741a 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -1,14 +1,19 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := graphics.c graphics_adf.c graphics_fbdev.c events.c resources.c +LOCAL_SRC_FILES := \ + events.cpp \ + graphics.c \ + graphics_adf.c \ + graphics_fbdev.c \ + resources.c \ LOCAL_WHOLE_STATIC_LIBRARIES += libadf LOCAL_STATIC_LIBRARIES += libpng LOCAL_MODULE := libminui -LOCAL_CFLAGS := -std=gnu11 +LOCAL_CLANG := true # This used to compare against values in double-quotes (which are just # ordinary characters in this context). Strip double-quotes from the -- cgit v1.2.3 From 07cfb8fe799901948afd6af05ef4674173713bcb Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 10 Apr 2015 13:12:05 -0700 Subject: Switch minui over to C++. Change-Id: I59e08a304ae514a3fdb6fab58721f11670bc1b01 --- minui/Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'minui/Android.mk') diff --git a/minui/Android.mk b/minui/Android.mk index 66dea741a..52f066256 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -3,10 +3,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ events.cpp \ - graphics.c \ - graphics_adf.c \ - graphics_fbdev.c \ - resources.c \ + graphics.cpp \ + graphics_adf.cpp \ + graphics_fbdev.cpp \ + resources.cpp \ LOCAL_WHOLE_STATIC_LIBRARIES += libadf LOCAL_STATIC_LIBRARIES += libpng -- cgit v1.2.3 From 1a92c4458dcc983f624a60fb75f9679c213e6814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= Date: Mon, 29 Jun 2015 20:05:48 -0700 Subject: Add drm support to minui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 22231636 Change-Id: I103c8e906b7dd9862b7bb89d8642268e9a3006b4 Signed-off-by: Stéphane Marchesin --- minui/Android.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'minui/Android.mk') diff --git a/minui/Android.mk b/minui/Android.mk index 52f066256..97724fbf0 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -5,10 +5,12 @@ LOCAL_SRC_FILES := \ events.cpp \ graphics.cpp \ graphics_adf.cpp \ + graphics_drm.cpp \ graphics_fbdev.cpp \ resources.cpp \ LOCAL_WHOLE_STATIC_LIBRARIES += libadf +LOCAL_WHOLE_STATIC_LIBRARIES += libdrm LOCAL_STATIC_LIBRARIES += libpng LOCAL_MODULE := libminui -- cgit v1.2.3