summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2015-07-08 10:09:16 +0200
committerAndreas Schneider <asn@cryptomilk.org>2015-07-09 11:53:35 +0200
commit8e5480c927a3846cbac2ec758e0cfbd637de5a50 (patch)
tree7e0e55ce006eff34acd9a10c44eac5a39cc9561c
parentd4a40112f16b06b98a61ebb54308edc3981e1c83 (diff)
downloadandroid_hardware_samsung_slsi_exynos5430-8e5480c927a3846cbac2ec758e0cfbd637de5a50.tar.gz
android_hardware_samsung_slsi_exynos5430-8e5480c927a3846cbac2ec758e0cfbd637de5a50.tar.xz
android_hardware_samsung_slsi_exynos5430-8e5480c927a3846cbac2ec758e0cfbd637de5a50.zip
exynos: Fix kernel and platform include directories
-rw-r--r--libdisplaymodule/Android.mk9
-rw-r--r--libhdmimodule/Android.mk9
-rw-r--r--libhwcutilsmodule/Android.mk9
-rw-r--r--libsecurepath/Android.mk3
4 files changed, 26 insertions, 4 deletions
diff --git a/libdisplaymodule/Android.mk b/libdisplaymodule/Android.mk
index 3b155db..d9873b6 100644
--- a/libdisplaymodule/Android.mk
+++ b/libdisplaymodule/Android.mk
@@ -15,13 +15,17 @@
ifeq ($(filter-out exynos5,$(TARGET_BOARD_PLATFORM)),)
LOCAL_PATH:= $(call my-dir)
+
+PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal
+
include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2 libsync libhwcutils libexynosgscaler libdisplay libmpp
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../../exynos5/include \
+ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
+ $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include \
$(TOP)/hardware/samsung_slsi/exynos/include \
$(TOP)/hardware/samsung_slsi/exynos/libexynosutils \
$(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
@@ -31,6 +35,9 @@ LOCAL_C_INCLUDES := \
$(TOP)/hardware/samsung_slsi/exynos/libdisplay \
$(TOP)/hardware/samsung_slsi/exynos/libmpp
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
LOCAL_SRC_FILES := \
ExynosPrimaryDisplay.cpp
diff --git a/libhdmimodule/Android.mk b/libhdmimodule/Android.mk
index aa228fd..0e853f5 100644
--- a/libhdmimodule/Android.mk
+++ b/libhdmimodule/Android.mk
@@ -15,13 +15,17 @@
ifeq ($(filter-out exynos5,$(TARGET_BOARD_PLATFORM)),)
LOCAL_PATH:= $(call my-dir)
+
+PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal
+
include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2 libsync libhdmi libdisplay
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../../exynos5/include \
+ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
+ $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include \
$(TOP)/hardware/samsung_slsi/exynos/include \
$(TOP)/hardware/samsung_slsi/exynos/libexynosutils \
$(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
@@ -30,6 +34,9 @@ LOCAL_C_INCLUDES := \
$(TOP)/hardware/samsung_slsi/exynos/libhwcutils \
$(TOP)/hardware/samsung_slsi/exynos/libdisplay
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
ifeq ($(BOARD_HDMI_INCAPABLE), true)
LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/exynos/libhdmi_dummy
else
diff --git a/libhwcutilsmodule/Android.mk b/libhwcutilsmodule/Android.mk
index 9eb6b2e..f3942ce 100644
--- a/libhwcutilsmodule/Android.mk
+++ b/libhwcutilsmodule/Android.mk
@@ -15,6 +15,9 @@
ifeq ($(filter-out exynos5,$(TARGET_BOARD_PLATFORM)),)
LOCAL_PATH:= $(call my-dir)
+
+PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal
+
include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
@@ -25,7 +28,8 @@ LOCAL_CFLAGS += -DUSES_VIRTUAL_DISPLAY
endif
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../../exynos5/include \
+ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
+ $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include \
$(TOP)/hardware/samsung_slsi/exynos/include \
$(TOP)/hardware/samsung_slsi/exynos/libexynosutils \
$(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \
@@ -35,6 +39,9 @@ LOCAL_C_INCLUDES := \
$(TOP)/hardware/samsung_slsi/exynos/libdisplay \
$(TOP)/hardware/samsung_slsi/exynos/libmpp
+LOCAL_ADDITIONAL_DEPENDENCIES += \
+ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
LOCAL_SRC_FILES := \
ExynosMPPModule.cpp
diff --git a/libsecurepath/Android.mk b/libsecurepath/Android.mk
index 9abd4c8..eff21c0 100644
--- a/libsecurepath/Android.mk
+++ b/libsecurepath/Android.mk
@@ -17,6 +17,7 @@
LOCAL_PATH := $(call my-dir)
+PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal
###############################################################################
# libcsecurepath.a
@@ -30,7 +31,7 @@ LOCAL_SRC_FILES += \
sec_g2ddrm.cpp
LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/../../exynos5/include \
+ $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include \
$(TOP)/hardware/samsung_slsi/exynos/include
LOCAL_SHARED_LIBRARIES += libMcClient