Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0322a717 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove FRAMEBUFFER_FORCE_FORMAT"

parents 213f0159 7a213516

libs/ui/Android.mk

+0 −4
Original line number Original line Diff line number Diff line
@@ -54,10 +54,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libutils \

	libutils \

	liblog

	liblog





ifneq ($(BOARD_FRAMEBUFFER_FORCE_FORMAT),)

LOCAL_CFLAGS += -DFRAMEBUFFER_FORCE_FORMAT=$(BOARD_FRAMEBUFFER_FORCE_FORMAT)

endif



LOCAL_MODULE := libui

LOCAL_MODULE := libui





include $(BUILD_SHARED_LIBRARY)

include $(BUILD_SHARED_LIBRARY)

libs/ui/UiConfig.cpp

+1 −11
Original line number Original line Diff line number Diff line
@@ -18,20 +18,10 @@ 




namespace android {

namespace android {





#ifdef FRAMEBUFFER_FORCE_FORMAT

// We need the two-level macro to stringify the contents of a macro argument

#define STRINGIFY(x) #x

#define TOSTRING(x) STRINGIFY(x)

#endif



void appendUiConfigString(String8& configStr)

void appendUiConfigString(String8& configStr)

{

{

    static const char* config =

    static const char* config =

            " [libui"

            " [libui]";

#ifdef FRAMEBUFFER_FORCE_FORMAT

            " FRAMEBUFFER_FORCE_FORMAT=" TOSTRING(FRAMEBUFFER_FORCE_FORMAT)

#endif

            "]";

    configStr.append(config);

    configStr.append(config);

}

}