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 "Revert "Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK""

This commit is contained in:
Vijay Venkatraman 2017-02-07 18:44:42 +00:00 committed by Gerrit Code Review
parent ef2f137e1a 30cbd906e0
commit 95fb9b8c60
16 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
msm8994/include/IQClient.h
View File

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

1
msm8994/include/IQService.h
View File

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

1
msm8994/include/alloc_controller.h
View File

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

1
msm8994/include/c2d2.h
View File

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

1
msm8994/include/copybit.h
View File

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

1
msm8994/include/copybit_priv.h
View File

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

1
msm8994/include/display_config.h
View File

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

1
msm8994/include/gr.h
View File

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

1
msm8994/include/gralloc_priv.h
View File

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

1
msm8994/include/mdp_version.h
View File

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

1
msm8994/include/memalloc.h
View File

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

1
msm8994/include/qdMetaData.h
View File

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

6
msm8994/libcopybit/Android.mk
View File

@ -15,6 +15,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 c2d2.h
include $(BUILD_COPY_HEADERS)
include $(CLEAR_VARS)
# b/24171136 many files not compiling with clang/llvm yet
LOCAL_CLANG := false
@ -26,7 +31,6 @@ 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

5
msm8994/libgralloc/Android.mk
View File

@ -29,7 +29,8 @@ 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_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := gralloc_priv.h gr.h
include $(BUILD_SHARED_LIBRARY)
@ -46,6 +47,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_C_EXPORT_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_COPY_HEADERS := alloc_controller.h memalloc.h
include $(BUILD_SHARED_LIBRARY)

6
msm8994/libqdutils/Android.mk
View File

@ -11,7 +11,8 @@ 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_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := display_config.h mdp_version.h
LOCAL_SRC_FILES := profiler.cpp mdp_version.cpp \
idle_invalidator.cpp \
comptype.cpp qd_utils.cpp \
@ -24,7 +25,8 @@ include $(CLEAR_VARS)
# b/24171136 many files not compiling with clang/llvm yet
LOCAL_CLANG := false
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := qdMetaData.h
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_C_INCLUDES := $(common_includes)
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)

5
msm8994/libqservice/Android.mk
View File

@ -14,6 +14,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := QService.cpp \
IQService.cpp \
IQClient.cpp
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := IQService.h \
IQClient.h
include $(BUILD_SHARED_LIBRARY)