diff --git a/hal/Android.mk b/hal/Android.mk
index dabd4f6..553d558 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -327,7 +327,7 @@
     LOCAL_CFLAGS += -DINSTANCE_ID_ENABLED
 endif
 
-# Hardware specific feature
+# Kernel specific feature
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_GKI)), true)
     LOCAL_CFLAGS += -DAUDIO_GKI_ENABLED
 endif
diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk
index 3369196..9384136 100644
--- a/hal/audio_extn/Android.mk
+++ b/hal/audio_extn/Android.mk
@@ -622,6 +622,11 @@
   LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
 endif
 
+# Kernel specific feature
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_GKI)), true)
+    LOCAL_CFLAGS += -DAUDIO_GKI_ENABLED
+endif
+
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_HEADER_LIBRARIES += libsystem_headers
 ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)
diff --git a/hal/audio_extn/compress_in.c b/hal/audio_extn/compress_in.c
index fb8834d..558b581 100644
--- a/hal/audio_extn/compress_in.c
+++ b/hal/audio_extn/compress_in.c
@@ -63,9 +63,15 @@
 };
 #define compress_config_set_timstamp_flag(config) (-ENOSYS)
 #else
+#ifdef AUDIO_GKI_ENABLED
+/* (config).codec->reserved[1] is for flags */
+#define compress_config_set_timstamp_flag(config) \
+            (config)->codec->reserved[1] |= COMPRESSED_TIMESTAMP_FLAG
+#else
 #define compress_config_set_timstamp_flag(config) \
             (config)->codec->flags |= COMPRESSED_TIMESTAMP_FLAG
-#endif
+#endif /* AUDIO_GKI_ENABLED */
+#endif /* COMPRESSED_TIMESTAMP_FLAG */
 
 #define COMPRESS_RECORD_NUM_FRAGMENTS 8
 
@@ -338,7 +344,7 @@
         flags |= audio_extn_utils_get_perf_mode_flag();
     }
 
-#ifdef AUDIO_QGKI_ENABLED
+#ifdef AUDIO_GKI_ENABLED
     /* out->compr_config.codec->reserved[0] is for compr_passthr */
     cin_data->compr_config.codec->reserved[0] = compr_passthr;
     /* out->compr_config.codec->reserved[1] is for flags */
diff --git a/hal/audio_extn/passthru.c b/hal/audio_extn/passthru.c
index 293ffac..f90fedf 100644
--- a/hal/audio_extn/passthru.c
+++ b/hal/audio_extn/passthru.c
@@ -250,7 +250,7 @@
      *stream has PCM format or
      *if a compress offload (DSP decode) session
      */
-#ifdef AUDIO_QGKI_ENABLED
+#ifdef AUDIO_GKI_ENABLED
     /* out->compr_config.codec->reserved[0] is for compr_passthr */
     compr_passthr = out->compr_config.codec->reserved[0];
 #else
@@ -486,7 +486,7 @@
        }
     }
 
-#ifdef AUDIO_QGKI_ENABLED
+#ifdef AUDIO_GKI_ENABLED
     /* out->compr_config.codec->reserved[0] is for compr_passthr */
     out->compr_config.codec->reserved[0] = compr_passthr;
 #else