display: Export headers
Display headers used by other components should be at a common
location to avoid issues with future changes in paths.
Change-Id: Iaec21206b82dd7dae03e598b9ec46b3e6f1bbf71
diff --git a/common.mk b/common.mk
index cefe060..02867d7 100644
--- a/common.mk
+++ b/common.mk
@@ -12,6 +12,8 @@
common_includes += $(TARGET_OUT_HEADERS)/pp/inc
endif
+common_header_export_path := qcom/display
+
#Common libraries external to display HAL
common_libs := liblog libutils libcutils libhardware
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk
index b125f11..b3d4249 100644
--- a/libcopybit/Android.mk
+++ b/libcopybit/Android.mk
@@ -16,6 +16,11 @@
include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)
+LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
+LOCAL_COPY_HEADERS := copybit.h copybit_priv.h
+#Copy the headers regardless of whether copybit is built
+include $(BUILD_COPY_HEADERS)
+
LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE_TAGS := optional
diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
index fb2b0df..a879c5c 100644
--- a/libgralloc/Android.mk
+++ b/libgralloc/Android.mk
@@ -25,7 +25,9 @@
LOCAL_SHARED_LIBRARIES += libqdutils libGLESv1_CM
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\"
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
-LOCAL_SRC_FILES := gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp
+LOCAL_SRC_FILES := gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp
+LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
+LOCAL_COPY_HEADERS := gralloc_priv.h
include $(BUILD_SHARED_LIBRARY)
@@ -38,6 +40,6 @@
LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libdl
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\"
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
-LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp
+LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp
include $(BUILD_SHARED_LIBRARY)
diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk
index eb04afb..459f548 100644
--- a/libqdutils/Android.mk
+++ b/libqdutils/Android.mk
@@ -15,7 +15,7 @@
include $(CLEAR_VARS)
-LOCAL_COPY_HEADERS_TO := qcom/display
+LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := qdMetaData.h
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
LOCAL_SHARED_LIBRARIES := liblog libcutils
diff --git a/libqservice/Android.mk b/libqservice/Android.mk
index e1585e4..17b2eda 100644
--- a/libqservice/Android.mk
+++ b/libqservice/Android.mk
@@ -12,5 +12,9 @@
LOCAL_SRC_FILES := QService.cpp \
IQService.cpp \
IQClient.cpp
+LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
+LOCAL_COPY_HEADERS := IQService.h \
+ IQClient.h
+
include $(BUILD_SHARED_LIBRARY)