Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK

Test: shamu builds again Bug: 33241851 Change-Id: Iabcef1ef53a18232cae42a68c9501262bf4af2ec
linckandrea · Feb 6, 2017 · f518f85 · f518f85
1 parent 8773e79
commit f518f85
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 15 deletions.
diff --git a/msm8084/include/IQClient.h b/msm8084/include/IQClient.h
@@ -0,0 +1 @@
+../libqservice/IQClient.h
diff --git a/msm8084/include/IQService.h b/msm8084/include/IQService.h
@@ -0,0 +1 @@
+../libqservice/IQService.h
diff --git a/msm8084/include/alloc_controller.h b/msm8084/include/alloc_controller.h
@@ -0,0 +1 @@
+../libgralloc/alloc_controller.h
diff --git a/msm8084/include/c2d2.h b/msm8084/include/c2d2.h
@@ -0,0 +1 @@
+../libcopybit/c2d2.h
diff --git a/msm8084/include/copybit.h b/msm8084/include/copybit.h
@@ -0,0 +1 @@
+../libcopybit/copybit.h
diff --git a/msm8084/include/copybit_priv.h b/msm8084/include/copybit_priv.h
@@ -0,0 +1 @@
+../libcopybit/copybit_priv.h
diff --git a/msm8084/include/display_config.h b/msm8084/include/display_config.h
@@ -0,0 +1 @@
+../libqdutils/display_config.h
diff --git a/msm8084/include/gr.h b/msm8084/include/gr.h
@@ -0,0 +1 @@
+../libgralloc/gr.h
diff --git a/msm8084/include/gralloc_priv.h b/msm8084/include/gralloc_priv.h
@@ -0,0 +1 @@
+../libgralloc/gralloc_priv.h
diff --git a/msm8084/include/mdp_version.h b/msm8084/include/mdp_version.h
@@ -0,0 +1 @@
+../libqdutils/mdp_version.h
diff --git a/msm8084/include/memalloc.h b/msm8084/include/memalloc.h
@@ -0,0 +1 @@
+../libgralloc/memalloc.h
diff --git a/msm8084/include/qdMetaData.h b/msm8084/include/qdMetaData.h
@@ -0,0 +1 @@
+../libqdutils/qdMetaData.h
diff --git a/msm8084/libcopybit/Android.mk b/msm8084/libcopybit/Android.mk
@@ -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
diff --git a/msm8084/libgralloc/Android.mk b/msm8084/libgralloc/Android.mk
@@ -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)
diff --git a/msm8084/libqdutils/Android.mk b/msm8084/libqdutils/Android.mk
@@ -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)

diff --git a/msm8084/libqservice/Android.mk b/msm8084/libqservice/Android.mk
@@ -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)