diff --git a/libaac/Android.mk b/libaac/Android.mk
index 79184e9..68a6a5d 100644
--- a/libaac/Android.mk
+++ b/libaac/Android.mk
@@ -1,4 +1,12 @@
 LOCAL_PATH := $(call my-dir)
+
+
+#--------------------------------------------------------------------------------
+# BUILD FOR SYSTEM PARTITION
+#Guard compilation of system modules from vendor-target as these modules would be
+#scanned during vendor compilation. With introduction of groups feature, this would
+#raise compilation issues as certain commonsys deliverables would be missing
+ifeq ($(call is-product-in-list, qssi qssi_32),true)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := aacEncode.cpp
@@ -22,6 +30,7 @@
 LOCAL_SYSTEM_EXT_MODULE := true
 LOCAL_SANITIZE := integer_overflow
 include $(BUILD_SHARED_LIBRARY)
+endif
 
 include $(CLEAR_VARS)