diff options
| author | Christopher R. Palmer <crpalmer@gmail.com> | 2014-09-07 05:19:39 -0400 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2015-07-08 12:34:58 +0200 |
| commit | d471598adf6c5e17725a8daec25e6d4919e16e3c (patch) | |
| tree | 0c4aa79e9eca19c303d4574d248a1196f3e8d001 | |
| parent | d64ba3c590abbef4827b85fdab7e004bb60f7b00 (diff) | |
| download | android_hardware_samsung_slsi_exynos5430-d471598adf6c5e17725a8daec25e6d4919e16e3c.tar.gz android_hardware_samsung_slsi_exynos5430-d471598adf6c5e17725a8daec25e6d4919e16e3c.tar.xz android_hardware_samsung_slsi_exynos5430-d471598adf6c5e17725a8daec25e6d4919e16e3c.zip | |
Android.mk: Use kernel includes
| -rw-r--r-- | include/ExynosJpegApi.h | 4 | ||||
| -rw-r--r-- | libhwjpeg/Android.mk | 4 | ||||
| -rw-r--r-- | mobicore/Android.mk | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/ExynosJpegApi.h b/include/ExynosJpegApi.h index 58fb937..26f3d08 100644 --- a/include/ExynosJpegApi.h +++ b/include/ExynosJpegApi.h @@ -18,8 +18,8 @@ #ifndef __EXYNOS_JPEG_BASE_H__ #define __EXYNOS_JPEG_BASE_H__ -#include "videodev2.h" -#include "videodev2_exynos_media.h" +#include <linux/videodev2.h> +#include <linux/videodev2_exynos_media.h> #define JPEG_CACHE_OFF (0) #define JPEG_CACHE_ON (1) diff --git a/libhwjpeg/Android.mk b/libhwjpeg/Android.mk index a6ae75e..8c06d53 100644 --- a/libhwjpeg/Android.mk +++ b/libhwjpeg/Android.mk @@ -20,10 +20,14 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libhwjpeg LOCAL_C_INCLUDES := \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(LOCAL_PATH)/../include \ $(TOP)/hardware/samsung_slsi/exynos/libexynosutils \ $(TOP)/hardware/samsung_slsi/exynos/include +LOCAL_ADDITIONAL_DEPENDENCIES += \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + LOCAL_SRC_FILES := \ ExynosJpegEncoder.cpp \ ExynosJpegDecoder.cpp \ diff --git a/mobicore/Android.mk b/mobicore/Android.mk index f637139..4152d7f 100644 --- a/mobicore/Android.mk +++ b/mobicore/Android.mk @@ -24,7 +24,9 @@ GLOBAL_LIBRARIES := libstlport # Include the Daemon include $(MOBICORE_PROJECT_PATH)/daemon/Android.mk -MC_INCLUDE_DIR := $(COMP_PATH_MobiCore)/inc \ +MC_INCLUDE_DIR := \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ + $(COMP_PATH_MobiCore)/inc \ $(COMP_PATH_MobiCore)/inc/GP \ $(COMP_PATH_MobiCore)/inc/TlCm \ $(COMP_PATH_MobiCore)/inc/TlCm/2.0 \ @@ -37,6 +39,8 @@ GDM_PROVLIB_SHARED_LIBS=libMcClient # Include the provisioning lib include $(MOBICORE_PROJECT_PATH)/provlib/Android.mk +LOCAL_ADDITIONAL_DEPENDENCIES += \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr MOBICORE_DIR_INC := $(MC_INCLUDE_DIR) include $(MOBICORE_PROJECT_PATH)/rootpa/Code/Android/app/jni/Android.mk |