diff --git a/os_pickup.bp b/os_pickup.bp
index e9c5c8a..4cfddc8 100644
--- a/os_pickup.bp
+++ b/os_pickup.bp
@@ -1,3 +1,17 @@
-//we are creating the namespace hardware/qcom/sm8150, hardware/qcom/sm8150/Android.bp links to this file
-soong_namespace {
+//hardware/qcom/sm8150/Android.bp links to this file
+bootstrap_go_package {
+    name: "soong-display_defaults",
+    pkgPath: "android/soong/hardware/qcom/sm8150/display",
+    deps: [
+        "blueprint",
+        "blueprint-pathtools",
+        "soong",
+        "soong-android",
+        "soong-cc",
+        "soong-genrule",
+    ],
+    srcs: [
+        "display/display_defaults.go",
+    ],
+    pluginFor: ["soong_build"],
 }
diff --git a/os_pickup.mk b/os_pickup.mk
index 7c4946e..b247490 100644
--- a/os_pickup.mk
+++ b/os_pickup.mk
@@ -1,4 +1,6 @@
 ifeq ($(PRODUCT_PLATFORM),sm8150)
+ifneq ($(BUILD_WITHOUT_VENDOR), true)
 LOCAL_PATH := $(call my-dir)
 include $(call first-makefiles-under,$(LOCAL_PATH))
 endif
+endif