aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorAdrian Salido <salidoa@google.com>2017-02-16 10:29:46 -0800
committerAdrian Salido <salidoa@google.com>2017-03-02 13:09:29 -0800
commite5c7565114b786bdf1bacc8c8ff3cb9517d17b92 (patch)
treed2047c7deb9c096252352320932fb2d5e7d9fb39 /Android.mk
parent0cc4568f31d178a9e8b5443e83e15beea95eb1cc (diff)
downloaddrm_hwcomposer-e5c7565114b786bdf1bacc8c8ff3cb9517d17b92.tar.gz
drm_hwcomposer: refactor Worker
Make use of standard library mutex and conditions which simplifies use of condition variables and benefits from things like scoped locking. Also add tests to make sure it runs as expected. Change-Id: Iaf92e17e1f6757dce490eddee61f84cb1f953b0c
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk21
1 files changed, 19 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 5308225..9efdeae 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,6 +15,22 @@
ifeq ($(strip $(BOARD_USES_DRM_HWCOMPOSER)),true)
LOCAL_PATH := $(call my-dir)
+
+# =====================
+# libdrmhwc_utils.a
+# =====================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ worker.cpp
+
+LOCAL_MODULE := libdrmhwc_utils
+
+include $(BUILD_STATIC_LIBRARY)
+
+# =====================
+# hwcomposer.drm.so
+# =====================
include $(CLEAR_VARS)
LOCAL_SHARED_LIBRARIES := \
@@ -28,6 +44,7 @@ LOCAL_SHARED_LIBRARIES := \
libui \
libutils
+LOCAL_STATIC_LIBRARIES := libdrmhwc_utils
LOCAL_C_INCLUDES := \
external/drm_gralloc \
@@ -59,8 +76,7 @@ LOCAL_SRC_FILES := \
platformnv.cpp \
separate_rects.cpp \
virtualcompositorworker.cpp \
- vsyncworker.cpp \
- worker.cpp
+ vsyncworker.cpp
ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),nvidia-gralloc)
LOCAL_CPPFLAGS += -DUSE_NVIDIA_IMPORTER
@@ -75,4 +91,5 @@ LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_SUFFIX := $(TARGET_SHLIB_SUFFIX)
include $(BUILD_SHARED_LIBRARY)
+include $(call all-makefiles-under,$(LOCAL_PATH))
endif