Split hwui's makefile

Change-Id: I7ad1a692e708cad052e8ca5b412c17e25992862c

3 files changed, 113 insertions, 134 deletions

diff --git a/libs/hwui/Android.common.mk b/libs/hwui/Android.common.mk
new file mode 100644
index 0000000..70db03d
--- /dev/null
+++ b/libs/hwui/Android.common.mk
@@ -0,0 +1,105 @@
+# 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-unused-parameter \
+    -Wno-deprecated-declarations \
+    -Wno-gnu-static-float-init
+
+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 \
+    Caches.cpp \
+    CanvasState.cpp \
+    DamageAccumulator.cpp \
+    DisplayList.cpp \
+    DeferredDisplayList.cpp \
+    DeferredLayerUpdater.cpp \
+    DisplayListLogBuffer.cpp \
+    DisplayListRenderer.cpp \
+    Dither.cpp \
+    DrawProfiler.cpp \
+    Extensions.cpp \
+    FboCache.cpp \
+    FontRenderer.cpp \
+    GammaFontRenderer.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 \
+    Stencil.cpp \
+    TessellationCache.cpp \
+    Texture.cpp \
+    TextureCache.cpp \
+    TextDropShadowCache.cpp
+
+# 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
+
+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_SHARED_LIBRARIES := liblog libcutils libutils libEGL libGLESv2 libskia libui libgui
+
+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
\ No newline at end of file
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 8cc4d15..1b73fbd 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -2,118 +2,14 @@ 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-unused-parameter \
-    -Wno-deprecated-declarations \
-    -Wno-gnu-static-float-init
-
 # 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 \
-        Caches.cpp \
-        CanvasState.cpp \
-        DamageAccumulator.cpp \
-        DisplayList.cpp \
-        DeferredDisplayList.cpp \
-        DeferredLayerUpdater.cpp \
-        DisplayListLogBuffer.cpp \
-        DisplayListRenderer.cpp \
-        Dither.cpp \
-        DrawProfiler.cpp \
-        Extensions.cpp \
-        FboCache.cpp \
-        FontRenderer.cpp \
-        GammaFontRenderer.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 \
-        Stencil.cpp \
-        TessellationCache.cpp \
-        Texture.cpp \
-        TextureCache.cpp \
-        TextDropShadowCache.cpp
-
-# 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
-
-    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 $(LOCAL_PATH)/Android.common.mk
 
     include $(BUILD_SHARED_LIBRARY)
 
diff --git a/libs/hwui/tests/Android.mk b/libs/hwui/tests/Android.mk
index 14739af..2fff07d 100644
--- a/libs/hwui/tests/Android.mk
+++ b/libs/hwui/tests/Android.mk
@@ -15,35 +15,9 @@
 #
 
 local_target_dir := $(TARGET_OUT_DATA)/local/tmp
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)/..
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES
-LOCAL_CFLAGS += -Wno-unused-parameter
-LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"
-LOCAL_CFLAGS += -Wno-unused-parameter
-
-LOCAL_SRC_FILES:= \
-	TestContext.cpp \
-	main.cpp
-
-LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/.. \
-	external/skia/src/core
-
-LOCAL_SHARED_LIBRARIES := \
-	liblog \
-	libcutils \
-	libutils \
-	libskia \
-	libgui \
-	libui \
-	libhwui
-
-ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
-	LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
-endif
-
 LOCAL_MODULE_PATH := $(local_target_dir)
 LOCAL_MODULE:= hwuitest
 LOCAL_MODULE_TAGS := tests
@@ -51,6 +25,10 @@ LOCAL_MULTILIB := both
 LOCAL_MODULE_STEM_32 := hwuitest
 LOCAL_MODULE_STEM_64 := hwuitest64
 
-include $(BUILD_EXECUTABLE)
+include $(LOCAL_PATH)/Android.common.mk
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
+LOCAL_SRC_FILES += \
+	tests/TestContext.cpp \
+	tests/main.cpp
+
+include $(BUILD_EXECUTABLE)