commit 28bf1cc9195121add79e88f2f8a811786701b9a9
author Simon Shields <keepcalm444@gmail.com> Mon Dec 05 18:18:09 2016 +1100
committer Paul Keith <javelinanddart@gmail.com> Tue Jan 10 13:25:38 2017 +0000
tree 97d48fc096c5054edd2cfc9c2dbb3ea1293ebbd4
parent 872abc67a7a907d718e077717e8a03280dea484c

exynos4: allow using SLSI stack

Change-Id: I6201fb7b513f0b0d771460be133a7f32691b5070

exynos4/hal/Android.mk

diff --git a/exynos4/hal/Android.mk b/exynos4/hal/Android.mk
index 2e286f9..5ce61b6 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 @@
   include $(call all-named-subdir-makefiles,$(exynos4x12_dirs))
 endif
 endif
+
+endif

exynos4x12.mk

diff --git a/exynos4x12.mk b/exynos4x12.mk
index 02027cc..00752fc 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