diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 10990f4..045fa87 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -67,9 +67,6 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 # Properties
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 
-# Soong namespaces
-PRODUCT_SOONG_NAMESPACES += $(COMMON_PATH)
-
 # Vendor
 TARGET_COPY_OUT_VENDOR := vendor
 
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 81dbb42..766400d 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -34,5 +34,9 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml
 
+# Soong namespaces
+PRODUCT_SOONG_NAMESPACES += \
+    $(LOCAL_PATH)
+
 # System properties
 -include $(LOCAL_PATH)/product_prop.mk
\ No newline at end of file