diff --git a/exynos4/hal/Android.mk b/exynos4/hal/Android.mk index 2e286f94..5ce61b69 100644 --- a/exynos4/hal/Android.mk +++ b/exynos4/hal/Android.mk @@ -14,6 +14,8 @@ # limitations under the License. # +ifeq ($(TARGET_SLSI_VARIANT),) + ifeq ($(TARGET_BOARD_PLATFORM),exynos4) common_exynos4_dirs := libgralloc_ump libhdmi libhwcomposer libhwconverter libsecion libUMP @@ -35,3 +37,5 @@ else include $(call all-named-subdir-makefiles,$(exynos4x12_dirs)) endif endif + +endif diff --git a/exynos4x12.mk b/exynos4x12.mk index 02027ccd..00752fcc 100644 --- a/exynos4x12.mk +++ b/exynos4x12.mk @@ -15,8 +15,10 @@ ifeq ($(TARGET_BOARD_PLATFORM),exynos4) ifeq ($(TARGET_SOC),exynos4x12) +ifeq ($(TARGET_SLSI_VARIANT),) include $(TARGET_HAL_PATH)/Android.mk include $(SAM_ROOT)/exynos/multimedia/Android.mk +endif include $(SAM_ROOT)/exynos4/exynos4x12/Android.mk include $(SAM_ROOT)/exynos4/nfc/Android.mk