diff --git a/os_pickup.bp b/os_pickup.bp
new file mode 100644
index 0000000..9515b25
--- /dev/null
+++ b/os_pickup.bp
@@ -0,0 +1,2 @@
+soong_namespace {
+}
diff --git a/os_pickup.mk b/os_pickup.mk
new file mode 100644
index 0000000..2074de8
--- /dev/null
+++ b/os_pickup.mk
@@ -0,0 +1,4 @@
+LOCAL_PATH := $(call my-dir)
+ifneq ($(filter $(LOCAL_PATH),$(PRODUCT_SOONG_NAMESPACES)),)
+include $(call first-makefiles-under,$(LOCAL_PATH))
+endif