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

Commit 04f46f03 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Remove FRAMEBUFFER_FORCE_FORMAT"

am: 0322a717

Change-Id: I6cf454e05dc69f1420e4d23593f105005cf0abd5
parents 654107c7 0322a717
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ LOCAL_SHARED_LIBRARIES := \
	libutils \
	liblog

ifneq ($(BOARD_FRAMEBUFFER_FORCE_FORMAT),)
LOCAL_CFLAGS += -DFRAMEBUFFER_FORCE_FORMAT=$(BOARD_FRAMEBUFFER_FORCE_FORMAT)
endif

LOCAL_MODULE := libui

include $(BUILD_SHARED_LIBRARY)
+1 −11
Original line number Diff line number Diff line
@@ -18,20 +18,10 @@

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)
{
    static const char* config =
            " [libui"
#ifdef FRAMEBUFFER_FORCE_FORMAT
            " FRAMEBUFFER_FORCE_FORMAT=" TOSTRING(FRAMEBUFFER_FORCE_FORMAT)
#endif
            "]";
            " [libui]";
    configStr.append(config);
}