diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 3ccbe5a..262a14c 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -14,8 +14,11 @@
 
 SOONG_CONFIG_NAMESPACES += omniromVarsPlugin
 
-PRODUCT_SOONG_NAMESPACES += vendor/gapps \
-    packages/apps/Bluetooth
+ifeq ($(ROM_BUILDTYPE),GAPPS)
+PRODUCT_SOONG_NAMESPACES += vendor/gapps
+endif
+
+PRODUCT_SOONG_NAMESPACES += packages/apps/Bluetooth
 
 SOONG_CONFIG_omniromVarsPlugin :=