commit 857a49935040f5b00ade07d6dbc3e53ebf815d34
author Isaac J. Manjarres <isaacm@codeaurora.org> Mon Apr 22 17:18:05 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 22 18:28:36 2019 -0700
tree 931b5e9b73f9c6d5aafa5bf705e202a43cb3cd67
parent 60c680f81b3d277e15fab7faa7ae14df82254289

display: Fix up kernel header dependencies declaration

Currently, when the kernel headers must be included
unconditionally, the dependency on them is not expressed
in the standard format.

For Android makefiles that must include the kernel headers,
declare the local additional dependencies unconditionally
and in standard form as well. Also, remove kernel_deps from
makefiles, as it is not used.

CRs-Fixed: 2439890
Change-Id: I928fdc6f734431fa0d60c1a3624b533a9d6a85b7

gpu_tonemapper/Android.mk

diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk
index da90754..61b134f 100644
--- a/gpu_tonemapper/Android.mk
+++ b/gpu_tonemapper/Android.mk
@@ -14,7 +14,7 @@
 LOCAL_HEADER_LIBRARIES    := display_headers
 LOCAL_C_INCLUDES          += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_SHARED_LIBRARIES    := libEGL libGLESv2 libGLESv3 libui libutils liblog
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_CFLAGS              := $(version_flag) -Wno-missing-field-initializers -Wall \
                              -Wno-unused-parameter -std=c++11 -DLOG_TAG=\"GPU_TONEMAPPER\"

gralloc/Android.mk

diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index 9dc043f..0955f56 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -16,7 +16,7 @@
                                  android.hardware.graphics.mapper@2.1
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wall -Werror
 LOCAL_CLANG                   := true
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_SRC_FILES               := gr_device_impl.cpp
 include $(BUILD_SHARED_LIBRARY)
 
@@ -49,7 +49,7 @@
 LOCAL_SHARED_LIBRARIES        := $(common_libs) libqdMetaData libdl libgrallocutils libion \
                                   android.hardware.graphics.mapper@2.1
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_SRC_FILES               := gr_allocator.cpp gr_buf_mgr.cpp gr_ion_alloc.cpp
 include $(BUILD_SHARED_LIBRARY)
 

sdm/libs/core/Android.mk

diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk
index 09e76cd..f8a58d1 100644
--- a/sdm/libs/core/Android.mk
+++ b/sdm/libs/core/Android.mk
@@ -22,7 +22,7 @@
     LOCAL_CFLAGS              += -DPP_DRM_ENABLE
 endif
 
-LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_SRC_FILES               := core_interface.cpp \
                                  core_impl.cpp \
                                  display_base.cpp \

sdm/libs/hwc2/Android.mk

diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index 55feeeb..daca922 100644
--- a/sdm/libs/hwc2/Android.mk
+++ b/sdm/libs/hwc2/Android.mk
@@ -10,6 +10,7 @@
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes)
 LOCAL_C_INCLUDES              += $(kernel_includes)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_HEADER_LIBRARIES        := display_headers
 
 LOCAL_CFLAGS                  := -Wno-missing-field-initializers -Wno-unused-parameter \