1 files changed, 6 insertions, 112 deletions
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index d0b9d82..aa8db26 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -2,118 +2,12 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
-# Too many unused parameters in external/skia/include and this directory.
-# getConfig in external/skia/include/core/SkBitmap.h is deprecated.
-# Allow Gnu extension: in-class initializer of static 'const float' member.
-LOCAL_CLANG_CFLAGS += \
-    -Wno-gnu-static-float-init
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE := libhwui
+LOCAL_MODULE_TAGS := optional
 
-# Only build libhwui when USE_OPENGL_RENDERER is
-# defined in the current device/board configuration
-ifeq ($(USE_OPENGL_RENDERER),true)
-    LOCAL_SRC_FILES := \
-        utils/Blur.cpp \
-        utils/GLUtils.cpp \
-        utils/SortedListImpl.cpp \
-        thread/TaskManager.cpp \
-        font/CacheTexture.cpp \
-        font/Font.cpp \
-        AmbientShadow.cpp \
-        AnimationContext.cpp \
-        Animator.cpp \
-        AnimatorManager.cpp \
-        AssetAtlas.cpp \
-        DamageAccumulator.cpp \
-        FontRenderer.cpp \
-        GammaFontRenderer.cpp \
-        Caches.cpp \
-        DisplayList.cpp \
-        DeferredDisplayList.cpp \
-        DeferredLayerUpdater.cpp \
-        DisplayListLogBuffer.cpp \
-        DisplayListRenderer.cpp \
-        Dither.cpp \
-        DrawProfiler.cpp \
-        Extensions.cpp \
-        FboCache.cpp \
-        GradientCache.cpp \
-        Image.cpp \
-        Interpolator.cpp \
-        Layer.cpp \
-        LayerCache.cpp \
-        LayerRenderer.cpp \
-        Matrix.cpp \
-        OpenGLRenderer.cpp \
-        Patch.cpp \
-        PatchCache.cpp \
-        PathCache.cpp \
-        PathTessellator.cpp \
-        PixelBuffer.cpp \
-        Program.cpp \
-        ProgramCache.cpp \
-        RenderBufferCache.cpp \
-        RenderNode.cpp \
-        RenderProperties.cpp \
-        RenderState.cpp \
-        ResourceCache.cpp \
-        ShadowTessellator.cpp \
-        SkiaShader.cpp \
-        Snapshot.cpp \
-        SpotShadow.cpp \
-        StatefulBaseRenderer.cpp \
-        Stencil.cpp \
-        TessellationCache.cpp \
-        Texture.cpp \
-        TextureCache.cpp \
-        TextDropShadowCache.cpp
+include $(LOCAL_PATH)/Android.common.mk
 
-# RenderThread stuff
-    LOCAL_SRC_FILES += \
-        renderthread/CanvasContext.cpp \
-        renderthread/DrawFrameTask.cpp \
-        renderthread/EglManager.cpp \
-        renderthread/RenderProxy.cpp \
-        renderthread/RenderTask.cpp \
-        renderthread/RenderThread.cpp \
-        renderthread/TimeLord.cpp
+include $(BUILD_SHARED_LIBRARY)
 
-    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 += -Wno-unused-parameter
-    LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-    LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libEGL libGLESv2 libskia libui libgui
-    LOCAL_MODULE := libhwui
-    LOCAL_MODULE_TAGS := optional
-
-    ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT))
-        LOCAL_CFLAGS += -DANDROID_ENABLE_RENDERSCRIPT
-        LOCAL_SHARED_LIBRARIES += libRS libRScpp
-        LOCAL_C_INCLUDES += \
-            $(intermediates) \
-            frameworks/rs/cpp \
-            frameworks/rs \
-
-    endif
-
-    ifndef HWUI_COMPILE_SYMBOLS
-        LOCAL_CFLAGS += -fvisibility=hidden
-    endif
-
-    ifdef HWUI_COMPILE_FOR_PERF
-        # TODO: Non-arm?
-        LOCAL_CFLAGS += -fno-omit-frame-pointer -marm -mapcs
-    endif
-
-    # Defaults for ATRACE_TAG and LOG_TAG for libhwui
-    LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"
-
-    LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
-
-    include $(BUILD_SHARED_LIBRARY)
-
-    include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
+include $(call all-makefiles-under,$(LOCAL_PATH))