diff --git a/Android.bp b/Android.bp
index 71a09a3..9515b25 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,2 @@
-subdirs = [
-    "light"
-]
+soong_namespace {
+}
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b14db00..fe8e86b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -111,6 +111,9 @@ BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private
 BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/qcom/sepolicy/private
 BOARD_PLAT_PUBLIC_SEPOLICY_DIR += device/qcom/sepolicy/public
 
+# Soong namespaces
+PRODUCT_SOONG_NAMESPACES += $(COMMON_PATH)
+
 # Treble
 BOARD_VNDK_VERSION := current
 PRODUCT_FULL_TREBLE_OVERRIDE := true