summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Willemsen <dwillemsen@google.com> 2016-08-01 01:12:35 -0700
committer Dan Willemsen <dwillemsen@google.com> 2016-08-25 15:42:07 -0700
commit7a213516a2640ef355cbcb5277bd031df36e436d (patch)
treebab690e7b35fa4aa5e3c8371494e2870ef1e532d
parent213f01593296211cea2279190aa20343529cba88 (diff)
Remove FRAMEBUFFER_FORCE_FORMAT
It's no longer used, except for a debugging line. Change-Id: I44e1c17129e71168b263e872e9aaab0f164d3832
-rw-r--r--libs/ui/Android.mk4
-rw-r--r--libs/ui/UiConfig.cpp12
2 files changed, 1 insertions, 15 deletions
diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk
index ee6c093bcf..69ee949c5d 100644
--- a/libs/ui/Android.mk
+++ b/libs/ui/Android.mk
@@ -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)
diff --git a/libs/ui/UiConfig.cpp b/libs/ui/UiConfig.cpp
index 9e7ba8e886..7730690cfd 100644
--- a/libs/ui/UiConfig.cpp
+++ b/libs/ui/UiConfig.cpp
@@ -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);
}