diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-03-06 13:40:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-06 13:40:23 +0000 |
| commit | b2ce73994c36cd56e907a7c6c3a3593ef79eea43 (patch) | |
| tree | e94321dd16ed9af3f62ba06ecf4d8a9b768621a6 | |
| parent | 5224590fd252a8c535498eb3083c56a7c3b1a36f (diff) | |
| parent | a06f1fb00f3f31b45b5b99e393f31bd7b3e87741 (diff) | |
| download | platform_hardware_qcom_display-o-preview.tar.gz platform_hardware_qcom_display-o-preview.tar.bz2 platform_hardware_qcom_display-o-preview.zip | |
Merge "Revert "For msm8996, replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK""android-o-preview-1android-n-mr2-preview-2o-preview
| -rw-r--r-- | msm8996/libcopybit/Android.mk | 6 | ||||
| -rw-r--r-- | msm8996/libgralloc/Android.mk | 9 | ||||
| -rw-r--r-- | msm8996/libgralloc1/Android.mk | 7 | ||||
| -rw-r--r-- | msm8996/libqdutils/Android.mk | 6 | ||||
| -rw-r--r-- | msm8996/libqservice/Android.mk | 4 |
5 files changed, 15 insertions, 17 deletions
diff --git a/msm8996/libcopybit/Android.mk b/msm8996/libcopybit/Android.mk index 8d75ee1b..212c5bcf 100644 --- a/msm8996/libcopybit/Android.mk +++ b/msm8996/libcopybit/Android.mk @@ -16,9 +16,9 @@ LOCAL_PATH:= $(call my-dir) include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) -LOCAL_MODULE := copybit_headers -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_HEADER_LIBRARY) +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) LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM) diff --git a/msm8996/libgralloc/Android.mk b/msm8996/libgralloc/Android.mk index 774f54bc..03da8140 100644 --- a/msm8996/libgralloc/Android.mk +++ b/msm8996/libgralloc/Android.mk @@ -15,12 +15,6 @@ # Gralloc module LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/../common.mk - -include $(CLEAR_VARS) -LOCAL_MODULE := gralloc_headers -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_HEADER_LIBRARY) - include $(CLEAR_VARS) LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) @@ -33,6 +27,8 @@ LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-si LOCAL_CLANG := true 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 include $(BUILD_SHARED_LIBRARY) @@ -47,5 +43,6 @@ LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\" -Wno-s LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp +LOCAL_COPY_HEADERS := alloc_controller.h memalloc.h include $(BUILD_SHARED_LIBRARY) diff --git a/msm8996/libgralloc1/Android.mk b/msm8996/libgralloc1/Android.mk index 56052af2..b66a027c 100644 --- a/msm8996/libgralloc1/Android.mk +++ b/msm8996/libgralloc1/Android.mk @@ -1,11 +1,6 @@ # Gralloc module LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/../common.mk - -include $(CLEAR_VARS) -LOCAL_MODULE := gralloc_headers -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_HEADER_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) @@ -25,4 +20,6 @@ LOCAL_SRC_FILES := gr_utils.cpp \ gr_allocator.cpp \ gr_buf_mgr.cpp \ gr_device_impl.cpp +LOCAL_COPY_HEADERS_TO := $(common_header_export_path) +LOCAL_COPY_HEADERS := gr_device_impl.h gralloc_priv.h gr_priv_handle.h include $(BUILD_SHARED_LIBRARY) diff --git a/msm8996/libqdutils/Android.mk b/msm8996/libqdutils/Android.mk index 71749df3..f56f7746 100644 --- a/msm8996/libqdutils/Android.mk +++ b/msm8996/libqdutils/Android.mk @@ -9,7 +9,8 @@ LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\" -Wno-sign-conversion LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_COPY_HEADERS_TO := $(common_header_export_path) +LOCAL_COPY_HEADERS := display_config.h LOCAL_SRC_FILES := profiler.cpp \ qd_utils.cpp \ display_config.cpp @@ -17,7 +18,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +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) diff --git a/msm8996/libqservice/Android.mk b/msm8996/libqservice/Android.mk index abe351bb..079d5eb8 100644 --- a/msm8996/libqservice/Android.mk +++ b/msm8996/libqservice/Android.mk @@ -14,7 +14,9 @@ LOCAL_SRC_FILES := QService.cpp \ IQService.cpp \ IQClient.cpp \ IQHDMIClient.cpp -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_COPY_HEADERS_TO := $(common_header_export_path) +LOCAL_COPY_HEADERS := IQService.h \ + IQClient.h include $(BUILD_SHARED_LIBRARY) |