diff --git a/Android.bp b/Android.bp
new file mode 100644
index 000000000..dbe5c97e7
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,2 @@
+subdirs = ["*"]
+
diff --git a/Android.mk b/Android.mk
index 9f0f0c376..f86f065e0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,5 +16,4 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-makefiles-under,$(LOCAL_PATH)) \
-	$(call all-makefiles-under,$(LOCAL_PATH)/libc)
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/Android.soong.mk b/Android.soong.mk
new file mode 100644
index 000000000..888404cf7
--- /dev/null
+++ b/Android.soong.mk
@@ -0,0 +1,4 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
diff --git a/libc/Android.mk b/libc/Android.mk
index 3fac08323..6bb6f436e 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1477,3 +1477,5 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 LOCAL_SANITIZE := never
 LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
 include $(BUILD_STATIC_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/libc/Android.soong.mk b/libc/Android.soong.mk
new file mode 100644
index 000000000..888404cf7
--- /dev/null
+++ b/libc/Android.soong.mk
@@ -0,0 +1,4 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
+