diff --git a/configure.ac b/configure.ac
index cbc082c..0db83d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,8 +56,26 @@
 
 AM_CONDITIONAL(USE_GLIB, test "x${with_glib}" = "xyes")
 
-AM_CONDITIONAL([QAHW_SUPPORT], [test x$BOARD_SUPPORTS_QAHW = xtrue])
+AC_SUBST([TARGET_PLATFORM], ["msm8916"])
+if (test x$TARGET_SUPPORT = xapq8009); then
+         AC_SUBST([TARGET_PLATFORM], ["msm8916"])
+         TARGET_CFLAGS="-DPLATFORM_MSM8909"
+fi
+if (test x$TARGET_SUPPORT = xapq8053); then
+         AC_SUBST([TARGET_PLATFORM], ["msm8916"])
+         TARGET_CFLAGS="-DPLATFORM_MSM8916"
+fi
+if (test x$TARGET_SUPPORT = xapq8096); then
+         AC_SUBST([TARGET_PLATFORM], ["msm8974"])
+         TARGET_CFLAGS="-DPLATFORM_MSM8996"
+fi
+if (test x$TARGET_SUPPORT = xapq8098); then
+         AC_SUBST([TARGET_PLATFORM], ["msm8974"])
+         TARGET_CFLAGS="-DPLATFORM_MSM8998"
+fi
+AC_SUBST([TARGET_CFLAGS])
 
+AM_CONDITIONAL([QAHW_SUPPORT], [test x$BOARD_SUPPORTS_QAHW = xtrue])
 AM_CONDITIONAL([HDMI_EDID],    [test x$AUDIO_FEATURE_ENABLED_HDMI_EDID = xtrue])
 AM_CONDITIONAL([FM_POWER_OPT], [test x$AUDIO_FEATURE_ENABLED_FM_POWER_OPT = xtrue])
 AM_CONDITIONAL([USBAUDIO], [test x$AUDIO_FEATURE_ENABLED_USBAUDIO = xtrue])
diff --git a/hal/Makefile.am b/hal/Makefile.am
index 6e1b9f4..03b60ce 100644
--- a/hal/Makefile.am
+++ b/hal/Makefile.am
@@ -4,12 +4,12 @@
         -I $(top_srcdir)/hal \
         -I $(top_srcdir)/hal/audio_extn \
         -I $(top_srcdir)/hal/voice_extn \
-        -I $(top_srcdir)/hal/msm8916
+        -I $(top_srcdir)/hal/${TARGET_PLATFORM}
 
 c_sources = audio_hw.c \
             voice.c \
             platform_info.c \
-            msm8916/platform.c \
+            ${TARGET_PLATFORM}/platform.c \
             audio_extn/audio_extn.c \
             audio_extn/utils.c
 
@@ -56,7 +56,7 @@
 
 if HW_VARIANTS
 AM_CFLAGS += -DHW_VARIANTS_ENABLED
-c_sources +=  msm8916/hw_info.c
+c_sources +=  ${TARGET_PLATFORM}/hw_info.c
 endif
 
 if COMPRESS_CAPTURE
@@ -149,5 +149,5 @@
 audio_primary_default_la_CFLAGS += -Dstrlcat=g_strlcat
 audio_primary_default_la_CFLAGS += -DINT_MAX=0x7fffffff
 audio_primary_default_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\)
-audio_primary_default_la_CFLAGS += -DLINUX_ENABLED
+audio_primary_default_la_CFLAGS += -DLINUX_ENABLED $(TARGET_CFLAGS)
 audio_primary_default_la_LDFLAGS = -module -shared -avoid-version