Piteball
/
android_hardware_qcom_display
mirror of https://github.com/followmsi/android_hardware_qcom_display.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK" 

am: 3fafab5499

Change-Id: I0b3bc7eec52ca5c0dc2cd757a573f42abd58d1b9
This commit is contained in:
Martijn Coenen 2017-02-06 12:04:16 +00:00 committed by android-build-merger
parent 781030d51b 3fafab5499
commit e5f9b5efd7
16 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
msm8084/include/IQClient.h Symbolic link
View File

@ -0,0 +1 @@
../libqservice/IQClient.h

1
msm8084/include/IQService.h Symbolic link
View File

@ -0,0 +1 @@
../libqservice/IQService.h

1
msm8084/include/alloc_controller.h Symbolic link
View File

@ -0,0 +1 @@
../libgralloc/alloc_controller.h

1
msm8084/include/c2d2.h Symbolic link
View File

@ -0,0 +1 @@
../libcopybit/c2d2.h

1
msm8084/include/copybit.h Symbolic link
View File

@ -0,0 +1 @@
../libcopybit/copybit.h

1
msm8084/include/copybit_priv.h Symbolic link
View File

@ -0,0 +1 @@
../libcopybit/copybit_priv.h

1
msm8084/include/display_config.h Symbolic link
View File

@ -0,0 +1 @@
../libqdutils/display_config.h

1
msm8084/include/gr.h Symbolic link
View File

@ -0,0 +1 @@
../libgralloc/gr.h

1
msm8084/include/gralloc_priv.h Symbolic link
View File

@ -0,0 +1 @@
../libgralloc/gralloc_priv.h

1
msm8084/include/mdp_version.h Symbolic link
View File

@ -0,0 +1 @@
../libqdutils/mdp_version.h

1
msm8084/include/memalloc.h Symbolic link
View File

@ -0,0 +1 @@
../libgralloc/memalloc.h

1
msm8084/include/qdMetaData.h Symbolic link
View File

@ -0,0 +1 @@
../libqdutils/qdMetaData.h

14
msm8084/libcopybit/Android.mk
View File

@ -16,18 +16,17 @@ 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 c2d2.h c2dExt.h
include $(BUILD_COPY_HEADERS)
# b/24171136 many files not compiling with clang/llvm yet
LOCAL_CLANG := false
include $(CLEAR_VARS)
LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libdl libmemalloc
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdcopybit\"
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
LOCAL_CFLAGS += -DCOPYBIT_Z180=1 -DC2D_SUPPORT_DISPLAY=1
@ -46,3 +45,8 @@ else
endif
endif
endif
ifeq ($(LOCAL_SRC_FILES),)
# Build the lib just for exporting the headers
include $(BUILD_SHARED_LIBRARY)
endif

5
msm8084/libgralloc/Android.mk
View File

@ -26,8 +26,7 @@ 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_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := gralloc_priv.h gr.h
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
include $(BUILD_SHARED_LIBRARY)
@ -41,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_COPY_HEADERS := alloc_controller.h memalloc.h
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
include $(BUILD_SHARED_LIBRARY)

6
msm8084/libqdutils/Android.mk
View File

@ -8,8 +8,7 @@ LOCAL_SHARED_LIBRARIES := $(common_libs) libui libbinder libqservice
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\"
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := display_config.h mdp_version.h
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_SRC_FILES := profiler.cpp mdp_version.cpp \
idle_invalidator.cpp \
comptype.cpp qd_utils.cpp \
@ -19,8 +18,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := qdMetaData.h
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_C_INCLUDES := $(common_includes)

4
msm8084/libqservice/Android.mk
View File

@ -13,9 +13,7 @@ LOCAL_SRC_FILES := QService.cpp \
IQService.cpp \
IQClient.cpp \
IQHDMIClient.cpp
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := IQService.h \
IQClient.h
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
include $(BUILD_SHARED_LIBRARY)