display: Clean up makefiles
Move common includes and shared libraries to
a common location
Change-Id: I0427f0f98b4c039a691be0ef6f3deead2b4bfa02
diff --git a/libtilerenderer/Android.mk b/libtilerenderer/Android.mk
index e0bf342..af8f25f 100644
--- a/libtilerenderer/Android.mk
+++ b/libtilerenderer/Android.mk
@@ -1,26 +1,22 @@
LOCAL_PATH := $(call my-dir)
+include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)
ifeq ($(USE_OPENGL_RENDERER),true)
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
-LOCAL_SHARED_LIBRARIES := libutils libcutils libGLESv2 libhwui
+LOCAL_MODULE := libtilerenderer
+LOCAL_MODULE_TAGS := optional
+LOCAL_C_INCLUDES := \
+ frameworks/base/include/utils \
+ frameworks/base/libs/hwui \
+ external/skia/include/core \
+ external/skia/include/effects \
+ external/skia/include/images \
+ external/skia/src/ports \
+ external/skia/include/utils \
+ hardware/libhardware/include/hardware \
+ frameworks/base/opengl/include/GLES2
-LOCAL_C_INCLUDES += \
- frameworks/base/include/utils \
- frameworks/base/libs/hwui \
- external/skia/include/core \
- external/skia/include/effects \
- external/skia/include/images \
- external/skia/src/ports \
- external/skia/include/utils \
- hardware/libhardware/include/hardware \
- frameworks/base/opengl/include/GLES2
-
-LOCAL_SRC_FILES := \
- tilerenderer.cpp
-
-LOCAL_MODULE := libtilerenderer
-LOCAL_MODULE_TAGS := optional
+LOCAL_SHARED_LIBRARIES := $(common_libs) libGLESv2 libhwui
+LOCAL_SRC_FILES := tilerenderer.cpp
include $(BUILD_SHARED_LIBRARY)
endif