Merge "Revert "Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK""
This commit is contained in:
commit
c6d20e7256
|
@ -1 +0,0 @@
|
|||
../libqservice/IQClient.h
|
|
@ -1 +0,0 @@
|
|||
../libqservice/IQService.h
|
|
@ -1 +0,0 @@
|
|||
../libgralloc/alloc_controller.h
|
|
@ -1 +0,0 @@
|
|||
../libcopybit/c2d2.h
|
|
@ -1 +0,0 @@
|
|||
../libcopybit/copybit.h
|
|
@ -1 +0,0 @@
|
|||
../libcopybit/copybit_priv.h
|
|
@ -1 +0,0 @@
|
|||
../libqdutils/display_config.h
|
|
@ -1 +0,0 @@
|
|||
../libgralloc/gr.h
|
|
@ -1 +0,0 @@
|
|||
../libgralloc/gralloc_priv.h
|
|
@ -1 +0,0 @@
|
|||
../libqdutils/mdp_version.h
|
|
@ -1 +0,0 @@
|
|||
../libgralloc/memalloc.h
|
|
@ -1 +0,0 @@
|
|||
../libqdutils/qdMetaData.h
|
|
@ -16,17 +16,18 @@ LOCAL_PATH:= $(call my-dir)
|
|||
include $(LOCAL_PATH)/../common.mk
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
# b/24171136 many files not compiling with clang/llvm yet
|
||||
LOCAL_CLANG := false
|
||||
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
|
||||
LOCAL_COPY_HEADERS := copybit.h copybit_priv.h c2d2.h c2dExt.h
|
||||
include $(BUILD_COPY_HEADERS)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
|
||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/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
|
||||
|
@ -45,8 +46,3 @@ else
|
|||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(LOCAL_SRC_FILES),)
|
||||
# Build the lib just for exporting the headers
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
endif
|
||||
|
|
|
@ -26,7 +26,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)
|
||||
|
||||
|
@ -40,6 +41,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_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
|
||||
LOCAL_COPY_HEADERS := alloc_controller.h memalloc.h
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
|
|
@ -8,7 +8,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 \
|
||||
|
@ -18,7 +19,8 @@ include $(BUILD_SHARED_LIBRARY)
|
|||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
|
||||
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
|
||||
LOCAL_C_INCLUDES := $(common_includes)
|
||||
|
|
|
@ -13,7 +13,9 @@ LOCAL_SRC_FILES := QService.cpp \
|
|||
IQService.cpp \
|
||||
IQClient.cpp \
|
||||
IQHDMIClient.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)
|
||||
|
|
Loading…
Reference in New Issue