From acf2c26bf6bd83f07b7975a6f9c650d7a24ef5b7 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 16 May 2016 16:55:08 -0700
Subject: [PATCH] Use Android.soong.mk to handle mixed Android.mk and
 Android.bp dirs

When building with soong Android.mk files are ignored in directories
that have Android.bp files.  Only parts of bionic have been converted to
Android.bp files, including some directories that have subdirectories
with Android.mk files.

Add Android.soong.mk files to include subdirectories to any directory
that has an Android.bp file but also has subdirectories with only
Android.mk files.

Change-Id: Ibd3c27d51c44f7a4b42dad0bc747e357b4ae34ca
---
 Android.bp            | 2 ++
 Android.mk            | 3 +--
 Android.soong.mk      | 4 ++++
 libc/Android.mk       | 2 ++
 libc/Android.soong.mk | 4 ++++
 5 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 Android.bp
 create mode 100644 Android.soong.mk
 create mode 100644 libc/Android.soong.mk

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))
+