diff options
-rw-r--r-- | Android.mk | 3 | ||||
-rw-r--r-- | gralloc/Android.mk | 4 | ||||
-rw-r--r-- | libdisplaymodule/Android.mk | 20 | ||||
-rw-r--r-- | libhdmimodule/Android.mk | 24 | ||||
-rw-r--r-- | libhwcutilsmodule/Android.mk | 20 | ||||
-rw-r--r-- | libhwjpeg/Android.mk | 4 | ||||
-rw-r--r-- | libkeymaster/Android.mk | 2 | ||||
-rw-r--r-- | libsecurepath/Android.mk | 8 | ||||
-rw-r--r-- | libvirtualdisplaymodule/Android.mk | 20 |
9 files changed, 52 insertions, 53 deletions
@@ -14,7 +14,9 @@ # limitations under the License. # +ifeq ($(TARGET_SLSI_VARIANT),cm) ifeq ($(TARGET_SOC), exynos5430) + exynos543x_dirs := \ mobicore \ gralloc \ @@ -37,3 +39,4 @@ endif include $(call all-named-subdir-makefiles,$(exynos543x_dirs)) endif +endif diff --git a/gralloc/Android.mk b/gralloc/Android.mk index 6c84519..0090051 100644 --- a/gralloc/Android.mk +++ b/gralloc/Android.mk @@ -24,8 +24,8 @@ LOCAL_SHARED_LIBRARIES := liblog libcutils libion libutils LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../include \ - $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/exynos5/include + $(TOP)/hardware/samsung_slsi-cm/exynos/include \ + $(TOP)/hardware/samsung_slsi-cm/exynos5/include LOCAL_SRC_FILES := \ gralloc.cpp \ diff --git a/libdisplaymodule/Android.mk b/libdisplaymodule/Android.mk index d9873b6..bb7778c 100644 --- a/libdisplaymodule/Android.mk +++ b/libdisplaymodule/Android.mk @@ -16,8 +16,6 @@ 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,15 +23,15 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2 LOCAL_C_INCLUDES := \ $(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 \ - $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libhwcmodule \ - $(TOP)/hardware/samsung_slsi/exynos/libhwc \ - $(TOP)/hardware/samsung_slsi/exynos/libhwcUtils \ - $(TOP)/hardware/samsung_slsi/exynos/libdisplay \ - $(TOP)/hardware/samsung_slsi/exynos/libmpp + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_BOARD_PLATFORM)/include \ + $(TOP)/hardware/samsung_slsi-cm/exynos/include \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libexynosutils \ + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_SOC)/include \ + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_SOC)/libhwcmodule \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libhwc \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libhwcUtils \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libdisplay \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libmpp LOCAL_ADDITIONAL_DEPENDENCIES += \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr diff --git a/libhdmimodule/Android.mk b/libhdmimodule/Android.mk index 0e853f5..e2a8207 100644 --- a/libhdmimodule/Android.mk +++ b/libhdmimodule/Android.mk @@ -16,8 +16,6 @@ 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,25 +23,25 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2 LOCAL_C_INCLUDES := \ $(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 \ - $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libhwcmodule \ - $(TOP)/hardware/samsung_slsi/exynos/libhwc \ - $(TOP)/hardware/samsung_slsi/exynos/libhwcutils \ - $(TOP)/hardware/samsung_slsi/exynos/libdisplay + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_BOARD_PLATFORM)/include \ + $(TOP)/hardware/samsung_slsi-cm/exynos/include \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libexynosutils \ + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_SOC)/include \ + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_SOC)/libhwcmodule \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libhwc \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libhwcutils \ + $(TOP)/hardware/samsung_slsi-cm/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 +LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi-cm/exynos/libhdmi_dummy else ifeq ($(BOARD_USES_NEW_HDMI), true) -LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/exynos/libhdmi +LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi-cm/exynos/libhdmi else -LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/exynos/libhdmi_legacy +LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi-cm/exynos/libhdmi_legacy endif endif diff --git a/libhwcutilsmodule/Android.mk b/libhwcutilsmodule/Android.mk index f3942ce..af5dd07 100644 --- a/libhwcutilsmodule/Android.mk +++ b/libhwcutilsmodule/Android.mk @@ -16,8 +16,6 @@ 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 @@ -29,15 +27,15 @@ endif LOCAL_C_INCLUDES := \ $(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 \ - $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libhwcmodule \ - $(TOP)/hardware/samsung_slsi/exynos/libhwc \ - $(TOP)/hardware/samsung_slsi/exynos/libhwcutils \ - $(TOP)/hardware/samsung_slsi/exynos/libdisplay \ - $(TOP)/hardware/samsung_slsi/exynos/libmpp + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_BOARD_PLATFORM)/include \ + $(TOP)/hardware/samsung_slsi-cm/exynos/include \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libexynosutils \ + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_SOC)/include \ + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_SOC)/libhwcmodule \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libhwc \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libhwcutils \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libdisplay \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libmpp LOCAL_ADDITIONAL_DEPENDENCIES += \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr diff --git a/libhwjpeg/Android.mk b/libhwjpeg/Android.mk index 8c06d53..cba9b48 100644 --- a/libhwjpeg/Android.mk +++ b/libhwjpeg/Android.mk @@ -22,8 +22,8 @@ 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 + $(TOP)/hardware/samsung_slsi-cm/exynos/libexynosutils \ + $(TOP)/hardware/samsung_slsi-cm/exynos/include LOCAL_ADDITIONAL_DEPENDENCIES += \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr diff --git a/libkeymaster/Android.mk b/libkeymaster/Android.mk index fbe728a..32dae9e 100644 --- a/libkeymaster/Android.mk +++ b/libkeymaster/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -MOBICORE_PATH := hardware/samsung_slsi/exynos5430/mobicore +MOBICORE_PATH := hardware/samsung_slsi-cm/exynos5430/mobicore LOCAL_MODULE := keystore.exynos5 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw diff --git a/libsecurepath/Android.mk b/libsecurepath/Android.mk index eff21c0..8c49c11 100644 --- a/libsecurepath/Android.mk +++ b/libsecurepath/Android.mk @@ -17,8 +17,6 @@ LOCAL_PATH := $(call my-dir) -PLATFORM_DIR := $(TARGET_BOARD_PLATFORM)-insignal - ############################################################################### # libcsecurepath.a include $(CLEAR_VARS) @@ -31,11 +29,11 @@ LOCAL_SRC_FILES += \ sec_g2ddrm.cpp LOCAL_C_INCLUDES += \ - $(TOP)/hardware/samsung_slsi/$(PLATFORM_DIR)/include \ - $(TOP)/hardware/samsung_slsi/exynos/include + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_BOARD_PLATFORM)/include \ + $(TOP)/hardware/samsung_slsi-cm/exynos/include LOCAL_SHARED_LIBRARIES += libMcClient -include hardware/samsung_slsi/$(TARGET_SOC)/mobicore/common/LogWrapper/Android.mk +include hardware/samsung_slsi-cm/$(TARGET_SOC)/mobicore/common/LogWrapper/Android.mk include $(BUILD_STATIC_LIBRARY) diff --git a/libvirtualdisplaymodule/Android.mk b/libvirtualdisplaymodule/Android.mk index bc422eb..7b6675c 100644 --- a/libvirtualdisplaymodule/Android.mk +++ b/libvirtualdisplaymodule/Android.mk @@ -23,15 +23,19 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils libexynosv4l2 LOCAL_CFLAGS += -DUSES_VIRTUAL_DISPLAY LOCAL_C_INCLUDES := \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(LOCAL_PATH)/../../exynos5/include \ - $(TOP)/hardware/samsung_slsi/exynos/include \ - $(TOP)/hardware/samsung_slsi/exynos/libexynosutils \ - $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/include \ - $(TOP)/hardware/samsung_slsi/$(TARGET_SOC)/libhwcmodule \ - $(TOP)/hardware/samsung_slsi/exynos/libhwc \ - $(TOP)/hardware/samsung_slsi/exynos/libhwcutils \ - $(TOP)/hardware/samsung_slsi/exynos/libdisplay \ - $(TOP)/hardware/samsung_slsi/exynos/libvirtualdisplay + $(TOP)/hardware/samsung_slsi-cm/exynos/include \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libexynosutils \ + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_SOC)/include \ + $(TOP)/hardware/samsung_slsi-cm/$(TARGET_SOC)/libhwcmodule \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libhwc \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libhwcutils \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libdisplay \ + $(TOP)/hardware/samsung_slsi-cm/exynos/libvirtualdisplay + +LOCAL_ADDITIONAL_DEPENDENCIES += \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_SRC_FILES := \ ExynosVirtualDisplayModule.cpp |