mako: Use direct project pathmap

Change-Id: I9fc2c19bee4294ba63a6bad75f52379d01f76784

Author: intervigilium

camera/Android.mk

@@ -89,14 +89,14 @@ ifeq ($(USE_DEVICE_SPECIFIC_CAMERA),true)
       #LOCAL_CFLAGS+= -DCAMERA_SMOOTH_ZOOM
 
       ifeq ($(V4L2_BASED_LIBCAM),true)
-        LOCAL_C_INCLUDES+= $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
+        LOCAL_C_INCLUDES+= $(call project-path-for,qcom-media)/mm-core/inc
         LOCAL_C_INCLUDES+= $(LOCAL_PATH)/mm-camera-interface
       endif
 
-      LOCAL_C_INCLUDES+= $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc
-      LOCAL_C_INCLUDES+= $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgenlock
+      LOCAL_C_INCLUDES+= $(call project-path-for,qcom-display)/libgralloc
+      LOCAL_C_INCLUDES+= $(call project-path-for,qcom-display)/libgenlock
       LOCAL_C_INCLUDES+= frameworks/native/include/media/hardware
-      LOCAL_C_INCLUDES+= $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/libstagefrighthw
+      LOCAL_C_INCLUDES+= $(call project-path-for,qcom-media)/libstagefrighthw
 
 
       ifeq ($(V4L2_BASED_LIBCAM),true)

camera/QCamera/HAL/core/Android.mk

@@ -64,9 +64,9 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
-LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgralloc \
-        $(call project-path-for,qcom-display)/$(TARGET_BOARD_PLATFORM)/libgenlock \
-        $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/libstagefrighthw
+LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libgralloc \
+        $(call project-path-for,qcom-display)/libgenlock \
+        $(call project-path-for,qcom-media)/libstagefrighthw
 
 # if debug service layer and up , use stub camera!
 LOCAL_C_INCLUDES += \

camera/QCamera/stack/mm-camera-interface/Android.mk

@@ -30,7 +30,7 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 endif
 
-LOCAL_C_INCLUDES+= $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
+LOCAL_C_INCLUDES+= $(call project-path-for,qcom-media)/mm-core/inc
 LOCAL_CFLAGS += -include bionic/libc/include/sys/socket.h
 LOCAL_CFLAGS += -include bionic/libc/include/sys/un.h
 

camera/mm-camera-interface/Android.mk

@@ -21,7 +21,7 @@ LOCAL_COPY_HEADERS += mm_omx_jpeg_encoder.h
 LOCAL_C_INCLUDES+= $(LOCAL_PATH)/..
 LOCAL_C_INCLUDES+= $(LOCAL_PATH)/../inc
 
-LOCAL_C_INCLUDES+= $(call project-path-for,qcom-media)/$(TARGET_BOARD_PLATFORM)/mm-core/inc
+LOCAL_C_INCLUDES+= $(call project-path-for,qcom-media)/mm-core/inc
 LOCAL_CFLAGS += -include bionic/libc/include/sys/socket.h
 LOCAL_CFLAGS += -include bionic/libc/include/sys/un.h