diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/Android.common.mk | 2 | ||||
| -rw-r--r-- | libs/hwui/Android.mk | 16 | ||||
| -rw-r--r-- | libs/hwui/Caches.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/DisplayListLogBuffer.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/ResourceCache.cpp | 2 |
5 files changed, 7 insertions, 17 deletions
diff --git a/libs/hwui/Android.common.mk b/libs/hwui/Android.common.mk index 70db03d..536912a 100644 --- a/libs/hwui/Android.common.mk +++ b/libs/hwui/Android.common.mk @@ -76,7 +76,7 @@ intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,) LOCAL_C_INCLUDES += \ external/skia/src/core -LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES +LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libEGL libGLESv2 libskia libui libgui diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 1b73fbd..aa8db26 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -2,16 +2,12 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -# Only build libhwui when USE_OPENGL_RENDERER is -# defined in the current device/board configuration -ifeq ($(USE_OPENGL_RENDERER),true) - LOCAL_MODULE_CLASS := SHARED_LIBRARIES - LOCAL_MODULE := libhwui - LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE := libhwui +LOCAL_MODULE_TAGS := optional - include $(LOCAL_PATH)/Android.common.mk +include $(LOCAL_PATH)/Android.common.mk - include $(BUILD_SHARED_LIBRARY) +include $(BUILD_SHARED_LIBRARY) - include $(call all-makefiles-under,$(LOCAL_PATH)) -endif +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp index 674102b..bb4ac83 100644 --- a/libs/hwui/Caches.cpp +++ b/libs/hwui/Caches.cpp @@ -29,10 +29,8 @@ namespace android { -#ifdef USE_OPENGL_RENDERER using namespace uirenderer; ANDROID_SINGLETON_STATIC_INSTANCE(Caches); -#endif namespace uirenderer { diff --git a/libs/hwui/DisplayListLogBuffer.cpp b/libs/hwui/DisplayListLogBuffer.cpp index bc9e7bd..23b6cff 100644 --- a/libs/hwui/DisplayListLogBuffer.cpp +++ b/libs/hwui/DisplayListLogBuffer.cpp @@ -47,10 +47,8 @@ namespace android { -#ifdef USE_OPENGL_RENDERER using namespace uirenderer; ANDROID_SINGLETON_STATIC_INSTANCE(DisplayListLogBuffer); -#endif namespace uirenderer { diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp index 31bd637..8a48a6e 100644 --- a/libs/hwui/ResourceCache.cpp +++ b/libs/hwui/ResourceCache.cpp @@ -22,10 +22,8 @@ namespace android { -#ifdef USE_OPENGL_RENDERER using namespace uirenderer; ANDROID_SINGLETON_STATIC_INSTANCE(ResourceCache); -#endif namespace uirenderer { |