msm7k: Use sanitized kernel headers
Add the exported sanitized kernel headers to include path in C2D/ copybit, gralloc and overlay HAL libraries. (cherry picked from commit a70f426e8695cc5bbf8a45b987b5715784f7e924) Change-Id: I1dbb79a086e9cb062e1264c1c354ac5ce1a05f27
This commit is contained in:
		
				
					committed by
					
						 Govind Surti
						Govind Surti
					
				
			
			
				
	
			
			
			
						parent
						
							6c4791e9c6
						
					
				
				
					commit
					cc2834b226
				
			| @@ -24,6 +24,8 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true) | ||||
|     LOCAL_SHARED_LIBRARIES := liblog libdl | ||||
|     LOCAL_SRC_FILES := copybit_c2d.cpp | ||||
|     LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM) | ||||
|     LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include | ||||
|     LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr | ||||
|     LOCAL_C_INCLUDES += hardware/msm7k/libgralloc-qsd8k | ||||
|     LOCAL_CFLAGS += -DCOPYBIT_Z180=1 -DC2D_SUPPORT_DISPLAY=1 | ||||
|     include $(BUILD_SHARED_LIBRARY) | ||||
| @@ -43,6 +45,8 @@ else | ||||
|             LOCAL_SHARED_LIBRARIES := liblog | ||||
|             LOCAL_SRC_FILES := copybit.cpp | ||||
|             LOCAL_MODULE := copybit.msm7k | ||||
|             LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include | ||||
|             LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr | ||||
|             LOCAL_C_INCLUDES += hardware/msm7k/libgralloc-qsd8k | ||||
|             LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1 | ||||
|             include $(BUILD_SHARED_LIBRARY) | ||||
| @@ -59,6 +63,8 @@ else | ||||
|             LOCAL_SHARED_LIBRARIES := liblog | ||||
|             LOCAL_SRC_FILES := copybit.cpp | ||||
|             LOCAL_MODULE := copybit.qsd8k | ||||
|             LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include | ||||
|             LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr | ||||
|             LOCAL_C_INCLUDES += hardware/msm7k/libgralloc-qsd8k | ||||
|             LOCAL_CFLAGS += -DCOPYBIT_QSD8K=1 | ||||
|             include $(BUILD_SHARED_LIBRARY) | ||||
|   | ||||
| @@ -21,6 +21,8 @@ LOCAL_PRELINK_MODULE := false | ||||
| LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw | ||||
| LOCAL_SHARED_LIBRARIES := liblog libcutils libGLESv1_CM | ||||
|  | ||||
| LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include | ||||
| LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr | ||||
| LOCAL_SRC_FILES := 	\ | ||||
| 	allocator.cpp 	\ | ||||
| 	framebuffer.cpp \ | ||||
| @@ -38,7 +40,7 @@ endif | ||||
|  | ||||
| ifeq ($(TARGET_HAVE_HDMI_OUT),true) | ||||
| LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY | ||||
| LOCAL_C_INCLUDES := $(LOCAL_PATH)/../liboverlay | ||||
| LOCAL_C_INCLUDES += $(LOCAL_PATH)/../liboverlay | ||||
| LOCAL_SHARED_LIBRARIES += liboverlay | ||||
| endif | ||||
|  | ||||
|   | ||||
| @@ -19,6 +19,8 @@ include $(CLEAR_VARS) | ||||
| LOCAL_PRELINK_MODULE := false | ||||
| LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) | ||||
| LOCAL_SHARED_LIBRARIES := liblog libcutils | ||||
| LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include | ||||
| LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr | ||||
| LOCAL_C_INCLUDES += hardware/msm7k/libgralloc-qsd8k | ||||
| LOCAL_SRC_FILES := overlayLib.cpp | ||||
| LOCAL_MODULE := liboverlay | ||||
| @@ -30,6 +32,8 @@ include $(CLEAR_VARS) | ||||
| LOCAL_PRELINK_MODULE := false | ||||
| LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw | ||||
| LOCAL_SHARED_LIBRARIES := liblog liboverlay libcutils | ||||
| LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include | ||||
| LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr | ||||
| LOCAL_C_INCLUDES += hardware/msm7k/libgralloc-qsd8k | ||||
| LOCAL_SRC_FILES := overlay.cpp | ||||
| LOCAL_MODULE := overlay.default | ||||
|   | ||||
		Reference in New Issue
	
	Block a user