diff --git a/libdisplay/Android.mk b/libdisplay/Android.mk
index 40d446c..014d51c 100644
--- a/libdisplay/Android.mk
+++ b/libdisplay/Android.mk
@@ -55,7 +55,7 @@ endif
 # old kernel APIs for calling it (S3C_FB_*).
 # Newer SoCs (Exynos 7420 onwards) make use of a new kernel API.
 # WARNING: Support is highly experimental!
-ifneq ($(filter exynos7420, $(TARGET_SOC)),)
+ifneq ($(filter exynos7420 exynos7580, $(TARGET_SOC)),)
 	LOCAL_CFLAGS += -DDECON_FB
 endif
 
diff --git a/libhwc/Android.mk b/libhwc/Android.mk
index 9af5385..5c2fb1a 100644
--- a/libhwc/Android.mk
+++ b/libhwc/Android.mk
@@ -94,7 +94,7 @@ endif
 # old kernel APIs for calling it (S3C_FB_*).
 # Newer SoCs (Exynos 7420 onwards) make use of a new kernel API.
 # WARNING: Support is highly experimental!
-ifneq ($(filter exynos7420, $(TARGET_SOC)),)
+ifneq ($(filter exynos7420 exynos7580, $(TARGET_SOC)),)
 	LOCAL_CFLAGS += -DDECON_FB
 endif
 
diff --git a/libhwcutils/Android.mk b/libhwcutils/Android.mk
index 23e3085..a266e83 100644
--- a/libhwcutils/Android.mk
+++ b/libhwcutils/Android.mk
@@ -54,7 +54,7 @@ endif
 # old kernel APIs for calling it (S3C_FB_*).
 # Newer SoCs (Exynos 7420 onwards) make use of a new kernel API.
 # WARNING: Support is highly experimental!
-ifneq ($(filter exynos7420, $(TARGET_SOC)),)
+ifneq ($(filter exynos7420 exynos7580, $(TARGET_SOC)),)
 	LOCAL_CFLAGS += -DDECON_FB
 endif
 
diff --git a/libvideocodec/Android.mk b/libvideocodec/Android.mk
index bfe0e48..48ce25b 100644
--- a/libvideocodec/Android.mk
+++ b/libvideocodec/Android.mk
@@ -46,6 +46,10 @@ ifeq ($(TARGET_SOC), exynos7420)
 LOCAL_CFLAGS += -DSOC_EXYNOS5430
 endif
 
+ifeq ($(TARGET_SOC), exynos7580)
+LOCAL_CFLAGS += -DSOC_EXYNOS5430
+endif
+
 LOCAL_MODULE := libExynosVideoApi
 LOCAL_MODULE_TAGS := optional
 LOCAL_ARM_MODE := arm