commit 4d78d03851a737c7d9b70742231053902a154176
author Naseer Ahmed <naseer@codeaurora.org> Wed Mar 22 12:47:30 2017 -0400
committer Naseer Ahmed <naseer@codeaurora.org> Thu Mar 23 18:50:22 2017 -0400
tree 5ed86dcf5a55644ed26ee0ec8ff1ed7eed8028ec
parent 84ecdf5b91588d61976b1da06145cf43f6886a81

display: makefile fixes

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

CRs-Fixed: 2023356
Change-Id: Ibb8900a77fc3fa47e6e54cd1649503eba12de8cd

libqdutils/Android.mk

diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk
index cc0b013..fb8a776 100644
--- a/libqdutils/Android.mk
+++ b/libqdutils/Android.mk
@@ -6,6 +6,7 @@
 LOCAL_MODULE_TAGS             := optional
 LOCAL_SHARED_LIBRARIES        := $(common_libs) libbinder libqservice
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
+LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdutils\" -Wno-sign-conversion
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_COPY_HEADERS_TO         := $(common_header_export_path)
@@ -21,6 +22,7 @@
 LOCAL_COPY_HEADERS              := qdMetaData.h
 LOCAL_SHARED_LIBRARIES          := liblog libcutils
 LOCAL_C_INCLUDES                := $(common_includes)
+LOCAL_HEADER_LIBRARIES          := display_headers
 LOCAL_ADDITIONAL_DEPENDENCIES   := $(common_deps)
 LOCAL_SRC_FILES                 := qdMetaData.cpp
 LOCAL_CFLAGS                    := $(common_flags) -Wno-sign-conversion