PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifdef overlay graphics

Browse Source 
Change-Id: If3173ddbfaccb95cc48636240ee3a918dac1e23f
This commit is contained in:
Ethan Yonker
2017-01-20 14:30:28 -06:00
parent c51bd35040
commit b386f71078
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minui/Android.mk
+2 -2
View File
@@ -6,13 +6,13 @@ LOCAL_SRC_FILES := \
graphics.cpp \
graphics_drm.cpp \
graphics_fbdev.cpp \
resources.cpp \
graphics_overlay.cpp
resources.cpp
LOCAL_C_INCLUDES := external/libcxx/include external/libpng
ifeq ($(TW_TARGET_USES_QCOM_BSP), true)
LOCAL_CFLAGS += -DMSM_BSP
LOCAL_SRC_FILES += graphics_overlay.cpp
ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
minui/graphics.cpp
+5 -3
View File
@@ -477,6 +477,7 @@ int gr_init(void)
gr_init_font();
gr_draw = NULL;
#ifdef MSM_BSP
gr_backend = open_overlay();
if (gr_backend) {
gr_draw = gr_backend->init(gr_backend);
@@ -485,9 +486,10 @@ int gr_init(void)
} else
printf("Using overlay graphics.\n");
}
#endif
#ifndef MSM_BSP
if (!gr_draw) {
if (!gr_backend || !gr_draw) {
gr_backend = open_adf();
if (gr_backend) {
gr_draw = gr_backend->init(gr_backend);
@@ -501,14 +503,14 @@ int gr_init(void)
printf("Skipping adf graphics because TW_TARGET_USES_QCOM_BSP := true\n");
#endif
if (!gr_draw) {
if (!gr_backend || !gr_draw) {
gr_backend = open_drm();
gr_draw = gr_backend->init(gr_backend);
if (gr_draw)
printf("Using drm graphics.\n");
}
if (!gr_draw) {
if (!gr_backend || !gr_draw) {
gr_backend = open_fbdev();
gr_draw = gr_backend->init(gr_backend);
if (gr_draw == NULL) {
minuitwrp/Android.mk
+1 -1
View File
@@ -6,7 +6,6 @@ LOCAL_SRC_FILES := \
graphics.cpp \
graphics_fbdev.cpp \
resources.cpp \
graphics_overlay.cpp \
truetype.cpp \
graphics_utils.cpp \
events.cpp
@@ -20,6 +19,7 @@ endif
ifeq ($(TW_TARGET_USES_QCOM_BSP), true)
LOCAL_CFLAGS += -DMSM_BSP
LOCAL_SRC_FILES += graphics_overlay.cpp
ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
minuitwrp/graphics.cpp
+5 -3
View File
@@ -296,6 +296,7 @@ int gr_init(void)
{
gr_draw = NULL;
#ifdef MSM_BSP
gr_backend = open_overlay();
if (gr_backend) {
gr_draw = gr_backend->init(gr_backend);
@@ -304,9 +305,10 @@ int gr_init(void)
} else
printf("Using overlay graphics.\n");
}
#endif
#ifdef HAS_ADF
if (!gr_draw) {
if (!gr_backend || !gr_draw) {
gr_backend = open_adf();
if (gr_backend) {
gr_draw = gr_backend->init(gr_backend);
@@ -325,7 +327,7 @@ int gr_init(void)
#endif
#ifdef HAS_DRM
if (!gr_draw) {
if (!gr_backend || !gr_draw) {
gr_backend = open_drm();
gr_draw = gr_backend->init(gr_backend);
if (gr_draw)
@@ -335,7 +337,7 @@ int gr_init(void)
printf("Skipping drm graphics -- not present in build tree\n");
#endif
if (!gr_draw) {
if (!gr_backend || !gr_draw) {
gr_backend = open_fbdev();
gr_draw = gr_backend->init(gr_backend);
if (gr_draw == NULL) {