Merge "gpu_tonemapper: ion fix" into display.lnx.3.3

AOSP-10-CAF · Nov 28, 2019 · dfe9b46 · dfe9b46
2 parents ec4118e + 5f561d8
commit dfe9b46
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
@@ -8,10 +8,8 @@ LOCAL_MODULE                  := hwcomposer.$(TARGET_BOARD_PLATFORM)
 LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_RELATIVE_PATH    := hw
 LOCAL_MODULE_TAGS             := optional
-LOCAL_C_INCLUDES              := $(common_includes)
-ifeq ($(TARGET_KERNEL_VERSION), 4.14)
-LOCAL_C_INCLUDES              += $(kernel_includes)
-endif
+LOCAL_C_INCLUDES              := $(common_includes) \
+                                 $(kernel_includes)
 LOCAL_HEADER_LIBRARIES        := display_headers
 
 LOCAL_CFLAGS                  := -Wno-missing-field-initializers -Wno-unused-parameter \