Use of the sw_sync API is not allowed any more. Until drm_hwcomposer is
weaned off of sw_sync, build our own copy.
Cc: John Stultz <john.stu...@linaro.org>
Cc: Rob Herring <rob.herr...@linaro.org>
Cc: Sean Paul <seanp...@google.com>
Signed-off-by: Alistair Strachan <astrac...@google.com>
---
Android.mk | 37 +++++++++++++++++++++++++++++--------
1 file changed, 29 insertions(+), 8 deletions(-)
diff --git a/Android.mk b/Android.mk
index 573c5aa..747bf27 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,15 +14,38 @@
ifeq ($(strip $(BOARD_USES_DRM_HWCOMPOSER)),true)
-LOCAL_PATH := $(call my-dir)
+__this_dir := $(call my-dir)
+
+# =====================
+# libdrmhwc_sync.a
+# =====================
+include $(CLEAR_VARS)
+
+LOCAL_PATH := system/core/libsync
+
+LOCAL_SRC_FILES := sync.c
+
+LOCAL_CFLAGS := -Wno-unused-variable
+
+LOCAL_MODULE := libdrmhwc_sync
+
+LOCAL_VENDOR_MODULE := true
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH) $(LOCAL_PATH)/include
+
+include $(BUILD_STATIC_LIBRARY)
# =====================
# libdrmhwc_utils.a
# =====================
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
- worker.cpp
+LOCAL_PATH := $(__this_dir)
+
+LOCAL_SRC_FILES := worker.cpp
LOCAL_MODULE := libdrmhwc_utils
LOCAL_VENDOR_MODULE := true
@@ -34,6 +57,8 @@ include $(BUILD_STATIC_LIBRARY)
# =====================
include $(CLEAR_VARS)
+LOCAL_PATH := $(__this_dir)
+
LOCAL_SHARED_LIBRARIES := \
libcutils \
libdrm \
@@ -41,14 +66,10 @@ LOCAL_SHARED_LIBRARIES := \
libGLESv2 \
libhardware \
liblog \
- libsync \
libui \
libutils
-LOCAL_STATIC_LIBRARIES := libdrmhwc_utils
-
-LOCAL_C_INCLUDES := \
- system/core/libsync
+LOCAL_STATIC_LIBRARIES := libdrmhwc_utils libdrmhwc_sync
LOCAL_SRC_FILES := \
autolock.cpp \
--
2.17.0.441.gb46fe60e1d-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
