diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-07-15 17:36:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-07-15 17:36:44 -0700 |
| commit | 21028318fd3eb2e16126835218f1e1056c7510b3 (patch) | |
| tree | eb19817ac2fb28f87b1b52499ebd81642dd84780 | |
| parent | 4279ae4b9c499b99066396604e5677d492f67498 (diff) | |
| parent | c55d60a3d7066d9c87070e4c3901d7f91a1ac1dc (diff) | |
| download | android_hardware_qcom_display-21028318fd3eb2e16126835218f1e1056c7510b3.tar.gz android_hardware_qcom_display-21028318fd3eb2e16126835218f1e1056c7510b3.tar.bz2 android_hardware_qcom_display-21028318fd3eb2e16126835218f1e1056c7510b3.zip | |
Merge "display: Export headers"
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | libcopybit/Android.mk | 5 | ||||
| -rw-r--r-- | libgralloc/Android.mk | 6 | ||||
| -rw-r--r-- | libqdutils/Android.mk | 2 | ||||
| -rw-r--r-- | libqservice/Android.mk | 4 |
5 files changed, 16 insertions, 3 deletions
@@ -12,6 +12,8 @@ ifeq ($(TARGET_USES_POST_PROCESSING),true) 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 b125f118e..b3d424997 100644 --- a/libcopybit/Android.mk +++ b/libcopybit/Android.mk @@ -16,6 +16,11 @@ LOCAL_PATH:= $(call my-dir) 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 fb2b0df87..a879c5c3c 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -25,7 +25,9 @@ LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc 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_C_INCLUDES := $(common_includes) $(kernel_includes) 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 eb04afb89..459f548eb 100644 --- a/libqdutils/Android.mk +++ b/libqdutils/Android.mk @@ -15,7 +15,7 @@ include $(BUILD_SHARED_LIBRARY) 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 e1585e41d..17b2edace 100644 --- a/libqservice/Android.mk +++ b/libqservice/Android.mk @@ -12,5 +12,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) 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) |