Android.mk: makefile fixes

* Deprecate LOCAL_COPY_HEADERS on newer builds
* Use a display header export path instead

Change-Id: Iee5cf1d320a655e6c45b38191681f2d697f07ec9

common.mk

@@ -1,11 +1,15 @@
 #Common headers
-common_includes := $(LOCAL_PATH)/../libgralloc
-common_includes += $(LOCAL_PATH)/../liboverlay
-common_includes += $(LOCAL_PATH)/../libcopybit
-common_includes += $(LOCAL_PATH)/../libqdutils
-common_includes += $(LOCAL_PATH)/../libhwcomposer
-common_includes += $(LOCAL_PATH)/../libhdmi
-common_includes += $(LOCAL_PATH)/../libqservice
+display_top := $(call my-dir)
+
+#Common headers
+common_includes := $(display_top)/libgralloc
+common_includes += $(display_top)/liboverlay
+common_includes += $(display_top)/libcopybit
+common_includes += $(display_top)/libqdutils
+common_includes += $(display_top)/libhwcomposer
+common_includes += $(display_top)/libhdmi
+common_includes += $(display_top)/libqservice
+common_includes += $(display_top)/include
 
 common_header_export_path := qcom/display
 
@@ -37,6 +41,9 @@ ifeq ($(TARGET_USES_QCOM_BSP),true)
     common_flags += -DQTI_BSP
     common_includes += vendor/qcom/opensource/display-frameworks/include
 endif
+
+common_flags += -isystem $(TARGET_OUT_HEADERS)/qcom/display
+
 ifneq ($(call is-platform-sdk-version-at-least,18),true)
     common_flags += -DANDROID_JELLYBEAN_MR1=1
 endif

include/Android.mk

@@ -0,0 +1,15 @@
+LOCAL_PATH:= $(call my-dir)
+include $(LOCAL_PATH)/../common.mk
+include $(CLEAR_VARS)
+#TODO move all exported headers to this directory
+LOCAL_MODULE := display_headers
+LOCAL_EXPORT_C_INCLUDE_DIRS   := $(display_top)/libcopybit \
+                                 $(display_top)/libqdutils \
+                                 $(display_top)/libqservice \
+
+ifeq ($(TARGET_USES_GRALLOC1), true)
+    LOCAL_EXPORT_C_INCLUDE_DIRS += $(display_top)/libgralloc1
+else
+    LOCAL_EXPORT_C_INCLUDE_DIRS += $(display_top)/libgralloc
+endif
+include $(BUILD_HEADER_LIBRARY)